Hi all,
On Tue, Aug 14, 2012 at 04:24:52PM +0200, Thijs Kinkhorst wrote:
> As it seems, Daniel has uploaded a version of open-vm-tools that reverts
> the contentious changes. This version has been in unstable for 11 days now
> and no bugs have been reported since.
>
> Can you please review and unblock?
I attached a debdiff between the version in testing
(8.8.0+2012.05.21-724730-1) and the version in unstable
(8.8.0+2012.05.21-724730-4).
The remaining changes are:
+ [ Thijs Kinkhorst ]
+ * Updating dkms.conf to make modules build again, thanks to H.A.J.
+ Koster (Closes: #679886).
+ * Calling dh_dkms with version argument (Closes: #677503).
Cheers,
Ivo
diff -Nru open-vm-tools-8.8.0+2012.05.21-724730/debian/changelog open-vm-tools-8.8.0+2012.05.21-724730/debian/changelog
--- open-vm-tools-8.8.0+2012.05.21-724730/debian/changelog 2012-06-14 12:05:21.000000000 +0200
+++ open-vm-tools-8.8.0+2012.05.21-724730/debian/changelog 2012-08-02 21:35:44.000000000 +0200
@@ -1,3 +1,36 @@
+open-vm-tools (2:8.8.0+2012.05.21-724730-4) unstable; urgency=low
+
+ * Reverting switch to xz compression to ease wheezy unblock.
+ * Reverting to load modules through kmod instead of initscript to ease
+ wheezy unblock.
+ * Reverting added sleep during restart in initscript to ease wheezy
+ unblock.
+ * Reverting removing old dpkg trigger for update-initramfs to ease
+ wheezy unblock.
+ * Reverting update of GPL boilerplate in copyright file to ease wheezy
+ unblock.
+
+ -- Daniel Baumann <daniel.baum...@progress-technologies.net> Thu, 02 Aug 2012 21:32:52 +0200
+
+open-vm-tools (2:8.8.0+2012.05.21-724730-3) unstable; urgency=low
+
+ [ Thijs Kinkhorst ]
+ * Updating dkms.conf to make modules build again, thanks to H.A.J.
+ Koster (Closes: #679886).
+
+ -- Daniel Baumann <daniel.baum...@progress-technologies.net> Mon, 16 Jul 2012 22:06:58 +0200
+
+open-vm-tools (2:8.8.0+2012.05.21-724730-2) unstable; urgency=low
+
+ * Switching to xz compression.
+ * Loading modules through kmod instead of initscript.
+ * Adding sleep during restart in initscript.
+ * Removing old dpkg trigger for update-initramfs.
+ * Updating GPL boilerplate in copyright file.
+ * Calling dh_dkms with version argument (Closes: #677503).
+
+ -- Daniel Baumann <daniel.baum...@progress-technologies.net> Sat, 30 Jun 2012 04:55:23 +0200
+
open-vm-tools (2:8.8.0+2012.05.21-724730-1) unstable; urgency=low
* Merging upstream version 8.8.0+2012.05.21-724730.
diff -Nru open-vm-tools-8.8.0+2012.05.21-724730/debian/open-vm-dkms.dkms open-vm-tools-8.8.0+2012.05.21-724730/debian/open-vm-dkms.dkms
--- open-vm-tools-8.8.0+2012.05.21-724730/debian/open-vm-dkms.dkms 2012-06-14 12:04:17.000000000 +0200
+++ open-vm-tools-8.8.0+2012.05.21-724730/debian/open-vm-dkms.dkms 2012-07-16 22:05:12.000000000 +0200
@@ -1,26 +1,48 @@
PACKAGE_NAME="open-vm-tools"
PACKAGE_VERSION="#MODULE_VERSION#"
+MAKE_CMD_TMPL="make VM_UNAME=\$kernelver \
+ MODULEBUILDDIR=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build"
+
+MAKE[0]="$MAKE_CMD_TMPL -C vmblock; \
+ $MAKE_CMD_TMPL -C vmci; \
+ $MAKE_CMD_TMPL -C vmhgfs; \
+ $MAKE_CMD_TMPL -C vmsync; \
+ $MAKE_CMD_TMPL -C vmxnet; \
+ $MAKE_CMD_TMPL -C vsock"
+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 vmxnet clean; \
+ $MAKE_CMD_TMPL -C vsock clean"
+
BUILT_MODULE_NAME[0]="vmblock"
+BUILT_MODULE_LOCATION[0]="vmblock/"
DEST_MODULE_LOCATION[0]="/updates/dkms/"
AUTOINSTALL=yes
BUILT_MODULE_NAME[1]="vmci"
+BUILT_MODULE_LOCATION[1]="vmci/"
DEST_MODULE_LOCATION[1]="/updates/dkms/"
AUTOINSTALL=yes
BUILT_MODULE_NAME[2]="vmhgfs"
+BUILT_MODULE_LOCATION[2]="vmhgfs/"
DEST_MODULE_LOCATION[2]="/updates/dkms/"
AUTOINSTALL=yes
BUILT_MODULE_NAME[3]="vmsync"
+BUILT_MODULE_LOCATION[3]="vmsync/"
DEST_MODULE_LOCATION[3]="/updates/dkms/"
AUTOINSTALL=yes
BUILT_MODULE_NAME[4]="vmxnet"
+BUILT_MODULE_LOCATION[4]="vmxnet/"
DEST_MODULE_LOCATION[4]="/updates/dkms/"
AUTOINSTALL=yes
BUILT_MODULE_NAME[5]="vsock"
+BUILT_MODULE_LOCATION[5]="vsock/"
DEST_MODULE_LOCATION[5]="/updates/dkms/"
AUTOINSTALL=yes
diff -Nru open-vm-tools-8.8.0+2012.05.21-724730/debian/rules open-vm-tools-8.8.0+2012.05.21-724730/debian/rules
--- open-vm-tools-8.8.0+2012.05.21-724730/debian/rules 2012-06-14 12:04:17.000000000 +0200
+++ open-vm-tools-8.8.0+2012.05.21-724730/debian/rules 2012-08-02 21:32:07.000000000 +0200
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+VERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed -e 's|^.*:.*+||' -e 's|-.*$$||')
+
%:
dh ${@} --with autotools_dev,dkms
@@ -49,6 +51,9 @@
override_dh_builddeb:
dh_builddeb -- -Zgzip -z9
+override_dh_dkms:
+ dh_dkms -V $(VERSION)
+
override_dh_fixperms:
dh_fixperms -Xsbin/mount.vmhgfs
