[Pkg-virtualbox-commits] [virtualbox] 01/01: Make possible to build only the guest-* packages (by commenting them in control file)

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository virtualbox.

commit a2030fd545f537b910265baa5674c343a25a755a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jan 8 16:15:22 2016 +0100

    Make possible to build only the guest-* packages (by commenting them in control file)
---
 debian/changelog |  6 ++++++
 debian/rules     | 24 +++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6fa1f1..2a57088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox (5.0.12-dfsg-3) UNRELEASED; urgency=medium
+
+  * Rework rules file to work also when only guest packages needs to be built.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 08 Jan 2016 16:14:58 +0100
+
 virtualbox (5.0.12-dfsg-2) unstable; urgency=low
 
   [ Felipe Sateler ]
diff --git a/debian/rules b/debian/rules
index c54d5a0..fcff2bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,9 +65,6 @@ override_dh_auto_build:
 	    KBUILD_VERBOSE=2 \
 	    VBOX_WITH_EXTPACK_VBOXDTRACE=
 
-# VBOX_WITH_VMSVGA and VBOX_WITH_VMSVGA3D are only for versions prior to 4.3.20 to fix CVE-2014-6595, CVE-2014-6590, CVE-2014-6589, CVE-2014-6588 and CVE-2015-0427
-
-
 	xsltproc --nonet --stringparam section.autolabel 1 \
 	    -o debian/README.Debian.html \
 	    /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl \
@@ -102,9 +99,10 @@ endif
 override_dh_install:
 	dh_install -p$(sname) -X out/bin/VBoxDbg.so
 	dh_install --remaining-packages
-
+ifneq (,$(filter $(uxname), $(shell dh_listpackages)))
 	install -m 644 -p -D out/bin/additions/vboxvideo_drv_system.so \
 	    debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
+endif
 # check if arch-any packages are being built
 ifneq (,$(filter $(sxname), $(shell dh_listpackages)))
 	convert debian/$(sxname)/usr/share/icons/hicolor/32x32/apps/virtualbox.png \
@@ -125,26 +123,32 @@ override_dh_link:
 
 override_dh_fixperms:
 	dh_fixperms
+
 # check if arch-any packages are being built
-ifneq (,$(filter $(sxname), $(shell dh_listpackages)))
+ifneq (,$(filter $(sname), $(shell dh_listpackages)))
 	chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxSDL;
 	chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxHeadless;
 	chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxNetDHCP;
 	chmod +s debian/$(sname)$(INSTALL_PATH)/VBoxNetAdpCtl;
-	chmod +s debian/$(sxname)$(INSTALL_PATH)/VirtualBox;
-
 	chmod 644 debian/$(sname)$(INSTALL_PATH)/*.rc;
 	chmod 644 debian/$(sname)$(INSTALL_PATH)/*.r0;
 
-	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/*.py; \
+	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/*.py;
 	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/server/*.py;
 	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/python/xpcom/client/*.py;
 	chmod 644 debian/$(sname)$(INSTALL_PATH)/sdk/bindings/xpcom/java/vboxjxpcom.jar;
 
-	chmod 755 debian/$(uxname)/usr/share/virtualbox/x11config.pl;
 	chmod 755 debian/$(sname)/usr/share/virtualbox/VBox.sh;
 endif
 
+ifneq (,$(filter $(sxname), $(shell dh_listpackages)))
+	chmod +s debian/$(sxname)$(INSTALL_PATH)/VirtualBox;
+endif
+
+ifneq (,$(filter $(uxname), $(shell dh_listpackages)))
+	chmod 755 debian/$(uxname)/usr/share/virtualbox/x11config.pl;
+endif
+
 # check if arch-all packages are being built
 ifneq (,$(filter $(psource), $(shell dh_listpackages)))
 	# These files have incorrect permissions, fixing it.
@@ -174,6 +178,7 @@ override_dh_dkms:
 	dh_dkms -V $(upstreamversion)
 
 override_dh_strip:
+ifneq (,$(filter $(sname), $(shell dh_listpackages)))
 	dh_strip --dbg-package=$(sname)-dbg
 
 	# strip files not handled by dh_strip
@@ -185,6 +190,7 @@ endif
 	# I don't see a reason to have these. If any user complains, we can try ship it.
 	rm -f debian/$(sname)/usr/lib/virtualbox/VMMRC.debug
 	rm -f debian/$(sname)/usr/lib/virtualbox/VMMR0.debug
+endif
 
 override_dh_shlibdeps:
 	dh_shlibdeps -p$(sname) -X debian/$(sname)$(INSTALL_PATH)/VBoxTestOGL -- \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git