~rcj/ubuntu/+source/open-vm-tools:utopic

Last commit made on 2015-05-29
Get this branch:
git clone -b utopic 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:
utopic
Repository:
lp:~rcj/ubuntu/+source/open-vm-tools

Recent commits

1a2d738... by Robert C Jennings

Fix merge omissions

f83798c... by Robert C Jennings

Merge branch 'master' into utopic

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

55d4057... 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).

e2c93fe... by Ben Howard

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

a0e9081... by Robert C Jennings

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

f4d870f... 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

2539f89... by Robert C Jennings

* debian/patches/dkms-do-not-build-vsock-vmxnet.patch:
  Prevent builds for vmxnet and vsock modules (LP: #1271669).
* Remove obsolete manpages: debian/manpages/vmblock.9,
   debian/manpages/vmci.9, debian/manpages/vmmemctl.9,
   debian/manpages/vmsock.9, debian/manpages/vmsync.9,
   debian/manpages/vmxnet.9
* Removed references to obsolete man pages in remaining manpages.

72da174... by Ben Howard

debian/rules: fixed dh_installinit directive (LP: #1270503).

8e3aa46... by Bernd Zeimetz

[31c30832] Revert "Enable building of vmci again."
This reverts commit 0d55577cd3c262dbbc2bf79593d6f500f84c4170.
Too fast upload, sorry. vmhgfs is indeed (still) broken with
vmci.

10a93f8... by Bernd Zeimetz

Import upstream version 9.4.0-1280544