Merge lp:~n-muench/ubuntu/quantal/open-vm-tools/open-vm-tools.may2.sid-sync into lp:ubuntu/quantal/open-vm-tools

[Nate Muench (Mink)]

This basically is the remaining stuff left out of the last proposal (because Debian did some updates after I submitted the proposal).

Everything from Debian has been included this proposal, with the following exceptions:
 *The stuff relating to kmod (Ubuntu doesn't have kmod in its repos yet)
 *The new DKMS config stuff (Basically an overhaul)
  +I'm gonna start bring the stuff over during the 13.04 cycle so I have a little time to test changes without the Feature Freeze coming closer and closer.

I think there is a page somewhere that is documenting which packages need to be transitioned to kmod (when it get's into repos next cycle). Can it be noted to not touch the modprobe lines, in this package) that involve pcnet32 and vmxnet. I want to test some solutions to existing problems (just warnings), that might be fixed with kmod.

--------------------------------------------------------------------------
I'm trying to get this proposal in the main Quantal repo before the Feature Freeze.

[Luke Yelavich (themuso)]

I notice that your branch removes open-vm-source, but I do not see any mention of it in the changelog. I see that it is replaced and breaks open-vm-toolbox however, so it has been deprecated. Still, a mention of why it is being removed in teh changelog would be useful.

Thanks for your work.

review: Needs Fixing

[Nate Muench (Mink) (n-muench)]

It's in there. 2nd star:
debian/control: Remove open-vm-source package.
 Only needed to add back open-vm-toolbox for Oneiric->Precise upgrade.

[Iain Lane (laney)]

Thanks a lot, uploaded. It'll stay in the queue for review until someone looks at it.

For next time it would be good if we could start using Debian's versioning scheme.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-20 15:59:51 +0000
+++ debian/changelog	2012-08-03 21:32:20 +0000
@@ -1,3 +1,37 @@
+open-vm-tools (2012.05.21-724730-0ubuntu2) quantal; urgency=low
+
+  * debian/open-vm-tools.init: Add if statement to check for vmxnet module,
+    and if found, remove pcnet32 module.
+  * debian/control: Remove open-vm-source package.
+    - Only needed to add back open-vm-toolbox for Oneiric->Precise upgrade.
+
+  * Items merged from Debian unstable:
+    - Switching to xz compression.
+    - Adding sleep during restart in initscript.
+    - Removing old dpkg trigger for update-initramfs.
+    - Updating GPL boilerplate in copyright file.
+
+ -- Nate Muench <[e-mail]>  Fri, 03 Aug 2012 16:09:30 -0500
+
+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 <[e-mail]>  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 <[e-mail]>  Sat, 30 Jun 2012 04:55:23 +0200
+
 open-vm-tools (2012.05.21-724730-0ubuntu1) quantal; urgency=low
 
   * Merging upstream version 2012.05.21-724730.

=== modified file 'debian/control'
--- debian/control	2012-06-20 15:59:51 +0000
+++ debian/control	2012-08-03 21:32:20 +0000
@@ -80,12 +80,3 @@
  This package provides the source code for the open-vm kernel modules.
  The open-vm-tools package is also required in order to make use of these
  modules. Kernel source or headers are required to compile these modules.
-
-Package: open-vm-source
-Architecture: all
-Depends: open-vm-toolbox, ${misc:Depends}
-Description: Transitional package for open-vm-source
- This is a transitional package for open-vm-source, used to reinstall
- open-vm-toolbox.
- .
- It can be safely removed after the installation is complete.

=== modified file 'debian/copyright'
--- debian/copyright	2012-06-20 15:59:51 +0000
+++ debian/copyright	2012-08-03 21:32:20 +0000
@@ -5,7 +5,7 @@
 
 Files: *
 Copyright: VMware, Inc. <http://www.vmware.com/>
-License: GPL-2.1
+License: LGPL-2.1
 
 Files: */Makefile*, modules/*
 Copyright: VMware, Inc. <http://www.vmware.com/>
@@ -60,53 +60,53 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 License: GPL-2
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; version 2 of the License.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
- St, Fifth Floor, Boston, MA 02110-1301 USA
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  The complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-2 file.
 
 License: GPL-2+
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
- St, Fifth Floor, Boston, MA 02110-1301 USA
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  The complete text of the GNU General Public License
  can be found in /usr/share/common-licenses/GPL-2 file.
 
-License: GPL-2.1
- This library is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the Free
- Software Foundation; version 2.1 of the License.
- .
- This library is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public License along
- with this library; if not, write to the Free Software Foundation, Inc., 51
- Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+License: LGPL-2.1
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, version 2.1 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  The complete text of the GNU Lesser General Public License
- can be found in /usr/share/common-licenses/LGPL-2.1 file.
+ can be found in /usr/share/common-licenses/GPL-2.1 file.
 
 License: MIT(*)
  Permission to use, copy, modify, and distribute this software for any purpose

=== modified file 'debian/open-vm-tools.init'
--- debian/open-vm-tools.init	2012-01-23 16:09:45 +0000
+++ debian/open-vm-tools.init	2012-08-03 21:32:20 +0000
@@ -31,9 +31,18 @@
 		log_progress_msg "vmhgfs"; modprobe vmhgfs
 		log_progress_msg "vmsync"; modprobe vmsync
 		log_progress_msg "vmblock"; modprobe vmblock
-		modprobe -r pcnet32
 		log_progress_msg "vmxnet"; modprobe vmxnet
-		modprobe pcnet32
+		log_end_msg 0
+
+		log_daemon_msg "Remove pcnet32 module, if vmxnet is loaded"
+		# check if vmxnet module is loaded
+		loaded="$(lsmod | grep -o vmxnet)"
+		if [ "$loaded" = "vmxnet" ]; then
+			# Removes pcnet32 module if vmxnet module is loaded
+			modprobe -r vmxnet
+			log_progress_msg "Removing pcnet32"; modprobe -r pcnet32
+			modprobe vmxnet
+		fi
 		log_end_msg 0
 
 		log_daemon_msg "Starting open-vm daemon" "vmtoolsd"
@@ -63,7 +72,9 @@
 		;;
 
 	force-reload|restart)
-		${0} stop; ${0} start
+		${0} stop
+		sleep 1
+		${0} start
 		;;
 
 	*)

=== removed file 'debian/open-vm-tools.triggers'
--- debian/open-vm-tools.triggers	2009-03-20 10:19:00 +0000
+++ debian/open-vm-tools.triggers	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-activate update-initramfs

=== modified file 'debian/rules'
--- debian/rules	2012-06-20 15:59:51 +0000
+++ debian/rules	2012-08-03 21:32:20 +0000
@@ -56,7 +56,7 @@
 	install -D -m 4755 vmware-user-suid-wrapper/vmware-user-suid-wrapper debian/open-vm-toolbox/usr/sbin/vmware-user-suid-wrapper
 
 override_dh_builddeb:
-	dh_builddeb -- -Zgzip -z9
+	dh_builddeb -- -Zxz -z9
 
 override_dh_fixperms:
 	dh_fixperms -Xsbin/mount.vmhgfs -Xusr/sbin/vmware-user-suid-wrapper

=== modified file 'debian/source/options'
--- debian/source/options	2011-08-28 16:10:21 +0000
+++ debian/source/options	2012-08-03 21:32:20 +0000
@@ -1,2 +1,2 @@
-compression = gzip
+compression = xz
 compression-level = 9