Merge lp:~ubuntu-branches/ubuntu/precise/open-vm-tools/precise-201201250102 into lp:ubuntu/precise/open-vm-tools

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/open-vm-tools reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/open-vm-tools/precise-201201250102. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

27. By Luke Yelavich on 2012-01-25

Merge from lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-sync1a

=== added file 'debian/open-vm-dkms.dkms'
--- debian/open-vm-dkms.dkms	1970-01-01 00:00:00 +0000
+++ debian/open-vm-dkms.dkms	2012-01-25 01:09:25 +0000
@@ -0,0 +1,26 @@
+PACKAGE_NAME="open-vm-tools"
+PACKAGE_VERSION="#MODULE_VERSION#"
+
+BUILT_MODULE_NAME[0]="vmblock"
+DEST_MODULE_LOCATION[0]="/updates/dkms/"
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[1]="vmci"
+DEST_MODULE_LOCATION[1]="/updates/dkms/"
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[2]="vmhgfs"
+DEST_MODULE_LOCATION[2]="/updates/dkms/"
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[3]="vmsync"
+DEST_MODULE_LOCATION[3]="/updates/dkms/"
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[4]="vmxnet"
+DEST_MODULE_LOCATION[4]="/updates/dkms/"
+AUTOINSTALL=yes
+
+BUILT_MODULE_NAME[5]="vsock"
+DEST_MODULE_LOCATION[5]="/updates/dkms/"
+AUTOINSTALL=yes

=== renamed file 'debian/open-vm-dkms.dkms' => 'debian/open-vm-dkms.dkms.moved'
=== added file 'debian/open-vm-toolbox.lintian-overrides'
--- debian/open-vm-toolbox.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/open-vm-toolbox.lintian-overrides	2012-01-25 01:09:25 +0000
@@ -0,0 +1,2 @@
+open-vm-toolbox: desktop-command-not-in-package /usr/share/applications/vmware-user.desktop vmware-user-suid-wrapper
+open-vm-toolbox: setuid-binary usr/sbin/vmware-user-suid-wrapper 4755 root/root

=== renamed file 'debian/open-vm-toolbox.lintian-overrides' => 'debian/open-vm-toolbox.lintian-overrides.moved'
=== added file 'debian/open-vm-toolbox.manpages'
--- debian/open-vm-toolbox.manpages	1970-01-01 00:00:00 +0000
+++ debian/open-vm-toolbox.manpages	2012-01-25 01:09:25 +0000
@@ -0,0 +1,1 @@
+debian/manpages/vmware-user-suid-wrapper.8

=== renamed file 'debian/open-vm-toolbox.manpages' => 'debian/open-vm-toolbox.manpages.moved'
=== added file 'debian/open-vm-tools.udev'
--- debian/open-vm-tools.udev	1970-01-01 00:00:00 +0000
+++ debian/open-vm-tools.udev	2012-01-25 01:09:25 +0000
@@ -0,0 +1,7 @@
+# VMware SCSI devices Timeout adjustment
+#
+# Modify the timeout value for VMware SCSI devices so that
+# in the event of a failover, we don't time out.
+# See Bug 271286 for more information.
+
+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware  " , ATTRS{model}=="Virtual disk    ",   RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"

=== renamed file 'debian/open-vm-tools.udev' => 'debian/open-vm-tools.udev.moved'
=== added file 'debian/patches/03-dkms.patch'
--- debian/patches/03-dkms.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03-dkms.patch	2012-01-25 01:09:25 +0000
@@ -0,0 +1,18 @@
+Author: Daniel Baumann <[e-mail]>
+Description: Correct wrong quote (Closes: #651778).
+
+diff -Naurp open-vm-tools.orig/modules/linux/dkms.conf open-vm-tools/modules/linux/dkms.conf
+--- open-vm-tools.orig/modules/linux/dkms.conf	2011-12-26 11:24:21.600667343 +0100
++++ open-vm-tools/modules/linux/dkms.conf	2011-12-26 11:24:43.172774312 +0100
+@@ -15,9 +15,9 @@ MAKE[0]="$MAKE_CMD_TMPL -C vmblock;    \
+ CLEAN[0]="$MAKE_CMD_TMPL -C vmblock clean;    \
+           $MAKE_CMD_TMPL -C vmci clean;       \
+           $MAKE_CMD_TMPL -C vmhgfs clean;     \
+-          $MAKE_CMD_TMPL -C vmsync clean";    \
++          $MAKE_CMD_TMPL -C vmsync clean;    \
+           $MAKE_CMD_TMPL -C vmxnet clean;     \
+-          $MAKE_CMD_TMPL -C vsock clean
++          $MAKE_CMD_TMPL -C vsock clean"
+ BUILT_MODULE_NAME[0]="vmblock"
+ BUILT_MODULE_NAME[1]="vmci"
+ BUILT_MODULE_NAME[2]="vmhgfs"

=== renamed file 'debian/patches/03-dkms.patch' => 'debian/patches/03-dkms.patch.moved'
=== added file 'debian/source/options'
--- debian/source/options	1970-01-01 00:00:00 +0000
+++ debian/source/options	2012-01-25 01:09:25 +0000
@@ -0,0 +1,2 @@
+compression = gzip
+compression-level = 9

=== renamed file 'debian/source/options' => 'debian/source/options.moved'
=== modified file 'modules/linux/dkms.conf'
=== modified file 'modules/linux/vmblock/Makefile'
=== modified file 'modules/linux/vmci/Makefile'
=== modified file 'modules/linux/vmhgfs/Makefile'
=== modified file 'modules/linux/vmsync/Makefile'
=== modified file 'modules/linux/vmxnet/Makefile'
=== modified file 'modules/linux/vsock/Makefile'