[Pkg-virtualbox-commits] [virtualbox] 01/03: Update rules file for the arch:all build

[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 ad3e2f809b96c96f0a01a0603bbc05f1b68e2723
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat Oct 3 16:07:28 2015 +0200

    Update rules file for the arch:all build
---
 debian/rules | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/debian/rules b/debian/rules
index 68355d9..d4456ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,9 +107,11 @@ override_dh_install:
 
 	install -m 644 -p -D out/bin/additions/vboxvideo_drv_system.so \
 	    debian/$(uxname)/usr/lib/xorg/modules/drivers/vboxvideo_drv.so
-	if [ -f debian/$(sxname)/usr/share/icons/hicolor/32x32/apps/virtualbox.png ] ; then \
+# 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 \
-	    debian/$(sxname)/usr/share/pixmaps/virtualbox.xpm; fi
+	    debian/$(sxname)/usr/share/pixmaps/virtualbox.xpm
+endif
 
 ifeq ($(DIST_NAME),Ubuntu)
 	install -m 644 -p -D debian/apport-hook.py \
@@ -125,24 +127,25 @@ override_dh_link:
 
 override_dh_fixperms:
 	dh_fixperms
-	if [ -d debian/$(sxname) ] ; then \
-	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; \
-	\
+# check if arch-any packages are being built
+ifneq (,$(filter $(sxname), $(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/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; \
-	fi
+	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
 
 # check if arch-all packages are being built
 ifneq (,$(filter $(psource), $(shell dh_listpackages)))

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