[Pkg-virtualbox-commits] r311 - trunk/debian

[lool at alioth.debian.org]

Author: lool
Date: 2008-07-01 15:37:44 +0000 (Tue, 01 Jul 2008)
New Revision: 311

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
* Use the -s flag to dh_ commands instead of 3 debhelper calls and a shell
  test; as a bonus, this provides additional detached symbols in -dbg.
* Install files into virtualbox-ose-guest-utils unconditionally and ignore
  errors -- even if these exist, the package is disabled on amd64.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-07-01 15:35:52 UTC (rev 310)
+++ trunk/debian/changelog	2008-07-01 15:37:44 UTC (rev 311)
@@ -29,6 +29,10 @@
   * Cleanup upstreamversion computation and compute it only once.
   * Set VBOX_WITH_X11_ADDITIONS in rules when the DEB_HOST_ARCH is i386 or
     lpia instead of using dpkg --print-architecture.
+  * Use the -s flag to dh_ commands instead of 3 debhelper calls and a shell
+    test; as a bonus, this provides additional detached symbols in -dbg.
+  * Install files into virtualbox-ose-guest-utils unconditionally and ignore
+    errors -- even if these exist, the package is disabled on amd64.
 
  -- Michael Meskes <meskes at debian.org>  Tue, 17 Jun 2008 14:52:36 +0200
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-07-01 15:35:52 UTC (rev 310)
+++ trunk/debian/rules	2008-07-01 15:37:44 UTC (rev 311)
@@ -129,17 +129,13 @@
 	dh_installchangelogs -a
 	dh_installdocs -a
 	dh_installmenu -a
-	dh_install -p$(sname)
+	dh_install -s
 	chmod 755 debian/$(sname)/usr/share/virtualbox/VBox.sh;
-	if [ "`dpkg --print-architecture`" = "i386" ]; then \
-		dh_install -p$(uname); \
-		chmod 755 debian/$(uname)/usr/share/virtualbox/x11config.pl; \
-		install -m 644 out/bin/additions/vboxvideo_drv_14.so debian/$(uname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so; \
-		install -m 644 out/bin/additions/vboxmouse_drv_14.so debian/$(uname)/usr/lib/xorg/modules/input/vboxmouse_drv.so; \
-		install -m 755 out/bin/additions/mountvboxsf debian/$(uname)/sbin/mount.vboxsf; \
-		dh_strip -p$(uname); \
-	fi
-	dh_strip -p$(sname) --dbg-package=$(sname)-dbg -X/usr/share/virtualbox/sdk/bin/xpidl
+	-chmod 755 debian/$(uname)/usr/share/virtualbox/x11config.pl
+	-install -m 644 out/bin/additions/vboxvideo_drv_14.so debian/$(uname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
+	-install -m 644 out/bin/additions/vboxmouse_drv_14.so debian/$(uname)/usr/lib/xorg/modules/input/vboxmouse_drv.so
+	-install -m 755 out/bin/additions/mountvboxsf debian/$(uname)/sbin/mount.vboxsf
+	dh_strip -s --dbg-package=$(sname)-dbg -X/usr/share/virtualbox/sdk/bin/xpidl
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a