Ubuntu
open-vm-tools package

~rcj/ubuntu/+source/open-vm-tools:trusty-updates

  1. Git
  2. lp:~rcj/ubuntu/+source/open-vm-tools
  3. trusty-updates
Last commit made on 2015-05-29
Get this branch:
git clone -b trusty-updates https://git.launchpad.net/~rcj/ubuntu/+source/open-vm-tools
Only Robert C Jennings can upload to this branch. If you are Robert C Jennings please log in for upload directions.

Branch merges

Branch information

Name:
trusty-updates
Repository:
lp:~rcj/ubuntu/+source/open-vm-tools

Recent commits

2e34c5f... by Robert C Jennings

Fix merge omissions

65ebf9b... by Robert C Jennings

Correct quilt state after merge

b3783ae... by Robert C Jennings

Merge branch 'master' into trusty-updates

Conflicts:
 .pc/applied-patches
 debian/changelog
 debian/control
 debian/local/vmxnet.hook
 debian/open-vm-tools-dkms.modprobe
 debian/open-vm-tools.postinst
 debian/patches/series
 debian/rules
 modules/linux/dkms.conf

d31cb8f... by Robert C Jennings

Merge remote-tracking branch 'debian/master'

Conflicts:
 debian/changelog
 debian/control
 debian/patches/series
 debian/rules

cff88f3... by Robert C Jennings

Unapply patches

feed2be... by Robert C Jennings

Merge upstream Debian (9.10.0-2476743-4) into Ubuntu

* Rename debian/local/run-vmblock\x2dfuse.mount to remove backslash for bzr
* Merge upstream Debian (9.10.0-2476743-4) into Ubuntu
  * [d7d898c4] Update package version in dkms file.
  * [4148c544] Also fix version number in modules/linux/dkms.sh.
  * [7967f7c1] Fix version number in configure.ac.
  * [4de8ff44] Add script to update patches.
  * [52b74910] Merge tag 'upstream/9.10.0-2476743'
  * [fddc317d] Refreshing patches for new upstream version.
  * [7b53f258] Add libmspack-dev as build-dependency.
  * [6b5841da] Add libssl-dev as build-dependency.
  * [de52be8e] Add libxerces-c-dev as build-dependency.
  * [17b2788a] Add libxml-security-c-dev as build-dependency.
  * [406817b6] Add patch to move from d_alias to d_u.d_alias.
  * [8df5b4ac] Adding patch to fix CVE-2014-4199.
  * [6b514014] Fix installation of systemd services.
  * [1130d9e9] Workaround for buggy dh_systemd_start.
  * [1d43a9e7] Remove the automount feature for vmblock-fuse.
  * [b06f93e5] Add mate-panel to xautostart.conf
  * [26a5da76] Workaround open-vm-tools-desktop upgrade failures.
  * [7f362040] Create /tmp/VMwareDnD for vmblock-fuse.
  * [c5f35c1b] Revert "Fix Breaks and Replaces Fields in debian/control"
  * [34797213] Fix Breaks and Replaces Fields in debian/control
  * [aff1eb77] Add udev rule for vsock.
  * [371e5d30] Move vsock udev rules into open-vm-tools.udev.
  * [edaeb2fd] Add systemd (auto)mount units for vmblock-fuse.
  * [171276e3] Remove update-rcd-params from dh_installinit.
  * [b04735fa] Ensure LINUX_BACKPORT is defined in patches/kuid_t-kgid_t-fix-for-3.12.
  * [01aaa407] Fix initramfs hook for the vmxnet module
  * [5279fa17] Move the dkms module location patch before otehr patches
  * [b1db2b5c] Move files belonging to modules in dkms package.
  * [d0ccee4f] Run #DEBHELPER# first in open-vm-tools-dkms.postinst.
  * [f680b4fa] Run update-initramfs in open-vm-tools-dkms.postrm.
  * [ef4bd019] Remove unused DEPRECATED define.
  * [5389dd1f] Some more fixes to make dkms build on 3.16
  * [4c1f5fa7] Drop dkms.conf patches.
  * [805ccb06] Tidying patches.
  * [519191ff] Fix dh_dkms call for new dkms.conf
  * [d493d4ce] Remove vmware-user-suid-wrapper.1 from open-vm-tools.
  * [d448e841] Merge tag 'upstream/9.4.6-1770165'
  * [969fc903] Ensure that vmware-user-suid-wrapper ships a suid bit.
  * [8067da08] Add -Wno-sizeof-pointer-memaccess gcc option.
  * [b5ba8c3b] refreshing patches.
  * [36cd39c6] Updating changelog.
  * [99f43e95] Revert "Add -Wno-sizeof-pointer-memaccess gcc option."
  * [bb95d814] Adding a patch from fedora instead of
  * [d6b2ad4a] Update manpages.
  * [3768ff7f] Better startup message if not in a vm.
  * [4d5dec19] Add patch for Debian 7.X os recognition.
  * [7b3d23c9] Refreshing patches.
  * [af20a700] Make patches/kuid_t-kgid_t-fix-for-3.12 compatible with older kernels.
  * [c4df056b] PIC handling in configure is broken.
  * [eafd8723] Rise the number of supported NICs.
  * [0ecb889e] Removing old transitional packages.
  * [5e039b52] Add missing Breaks/Replaces for file moves.
  * [9d01b21d] Fix vsock removal patch, add some missing ""
  * [2ae80665] Add e55039c_HGFS-Fix-Linux-client-symlinks patch again.
  * [d7f7e40e] Fix vsock removal patch (avoid { foo;; })
  * [9960cb11] Add gbp setting for merge info in changelog.
  * [645a5350] Remove old patch for the vsock module.
  * [4c8effb7] Fix patch to avoid building vmblock on kernel >= 3.0.
  * [2cbfa96d] Refreshing patches.
  * [be59923b] Do not build vsock on kernels >= 3.9
  * [6d36f49e] Move .desktop file into the -desktop package.
  * [ef406f81] Move /lib/modules-load.d/open-vm-tools.conf to open-vm-tools-dkms.
  * [56742c8c] Revert "Use /run/VMwareDnD instead of /tmp/VMwareDnD."
  * [c6df2503] Patch pam.d/vmtoolsd to use common-auth/account.
  * [4e45e2e8] Hot apply udev rule for disk timeout
  * [527525fc] fix syntax-error-in-dep5-copyright
  * [5f6b2a47] fix malformed-override open-vm-toolbox
  * [5aabaf79] fix manpage-has-errors-from-man
  * [f867443c] fix executable-not-elf-or-script
  * [f89024a1] fix file locations in copyright
  * [76dadf83] Add patch for CVE-2013-3237.
  * [fa7d4a63] Merge pull request #1 from yastupin/master
  * [115b8c49] Better permission handling.
  * [70fa10d1] Fix vmxnet initramfs-tools hook.
  * [9d3f3c9b] Move vmware-user-suid-wrapper into desktop package.
  * [49dc599d] Use /run/VMwareDnD instead of /tmp/VMwareDnD.
  * [d9467cd9] Dropping lintian override files.
  * [a7f7e5bd] Use libprocps-dev instead of libprocps0-dev.
  * [21214012] Use manpages-desktop as source folder for -desktop.

99fa19f... by Robie Basak

Add open-vm-tools breaks/replaces against older open-vm-toolbox, since /etc/xdg/autostart/vmware-user.desktop moved across when Ubuntu synced against Debian (LP: #1301919).

bc9067c... by Ben Howard

Change startup message failure to state the reason why open-vm-tools does not start on non-VMware hypervisors (LP: #1289564).

6ae885e... by Robert C Jennings

Fix package dependancy that broke open-vm-dkms installation. (LP: #1281708)

8b56f0b... by Robert C Jennings

* Remove DKMS package and support for vmhgfs filesystem module,
  as the 3.13 kernel and later do not support it (LP: #1272196).
  - debian/control: removed dkms packages
  - debian/rules: removed vmghfs module support (deprecated)
  - debian/manpages: removed obsolete man pages