[Python-modules-commits] r17999 - in packages/pyside/trunk/debian (rules)

[odyx at users.alioth.debian.org]

    Date: Tuesday, August 2, 2011 @ 20:42:56
  Author: odyx
Revision: 17999

Update buildsystem to ensure proper build'ability of arch:all packages.

Modified:
  packages/pyside/trunk/debian/rules

Modified: packages/pyside/trunk/debian/rules
===================================================================
--- packages/pyside/trunk/debian/rules	2011-08-02 20:42:47 UTC (rev 17998)
+++ packages/pyside/trunk/debian/rules	2011-08-02 20:42:56 UTC (rev 17999)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with python2 --buildsystem=cmake --parallel $@
+	dh $@ --with python2 --buildsystem=cmake --parallel
 
 # Python versions
 PYVERSIONS=$(shell pyversions -v -r)
@@ -18,7 +18,7 @@
 
 override_dh_auto_configure_dbg-%:
 	mkdir -p build-$*-dbg
-	dh_auto_configure --builddirectory=build-$*-dbg -- \
+	dh_auto_configure -a --builddirectory=build-$*-dbg -- \
 	-DCMAKE_VERBOSE_MAKEFILE=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
 	-DCMAKE_SKIP_RPATH=true \
@@ -28,7 +28,7 @@
 
 override_dh_auto_configure-%:
 	mkdir -p build-$*
-	dh_auto_configure --builddirectory=build-$* -- \
+	dh_auto_configure -a --builddirectory=build-$* -- \
 	-DCMAKE_VERBOSE_MAKEFILE=OFF \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_SKIP_RPATH=true \
@@ -42,25 +42,25 @@
 override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build_dbg-%) $(PYVERSIONS:%=override_dh_auto_build-%)
 
 override_dh_auto_build_dbg-%:
-	dh_auto_build --builddirectory=build-$*-dbg
+	dh_auto_build -a --builddirectory=build-$*-dbg
 
 override_dh_auto_build-%:
-	dh_auto_build --builddirectory=build-$*
+	dh_auto_build -a --builddirectory=build-$*
 
 #### INSTALL ####
 
 override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install_dbg-%) $(PYVERSIONS:%=override_dh_auto_install-%)
 
 override_dh_auto_install_dbg-%:
-	dh_auto_install --builddirectory=build-$*-dbg --destdir=debian/tmp-dbg
+	dh_auto_install -a --builddirectory=build-$*-dbg --destdir=debian/tmp-dbg
 
 override_dh_auto_install-%:
-	dh_auto_install --builddirectory=build-$*
+	dh_auto_install -a --builddirectory=build-$*
 
 #### Shared libs ####
 override_dh_makeshlibs: $(PYVERSIONS:%=override_dh_makeshlibs-%)
 	cat debian/libpyside${LIBPYSIDE_SOVERSION}.symbols-py* > debian/libpyside${LIBPYSIDE_SOVERSION}.symbols
-	dh_makeshlibs
+	dh_makeshlibs -a
 
 override_dh_makeshlibs-%:
 	echo "libpyside-python$*.so.${LIBPYSIDE_SOVERSION} libpyside${LIBPYSIDE_SOVERSION} #MINVER#" > debian/libpyside${LIBPYSIDE_SOVERSION}.symbols-py$*
@@ -75,16 +75,16 @@
 
 #### STRIP ####
 override_dh_strip:
-	dh_strip --dbg-package=python-pyside-dbg --exclude=-dbg.so --exclude=_d.so
+	dh_strip -a --dbg-package=python-pyside-dbg --exclude=-dbg.so --exclude=_d.so
 	
 #### TEST ####
 override_dh_auto_test: $(PYVERSIONS:%=override_dh_auto_test_dbg-%) $(PYVERSIONS:%=override_dh_auto_test-%)
 
 override_dh_auto_test_dbg-%:
-	- dh_auto_test --builddirectory=build-$*-dbg
+	- dh_auto_test -a --builddirectory=build-$*-dbg
 
 override_dh_auto_test-%:
-	- dh_auto_test --builddirectory=build-$*
+	- dh_auto_test -a --builddirectory=build-$*
 
 #### usr/share/doc/* symlinks ####
 override_dh_link:
@@ -108,6 +108,7 @@
 override_dh_install: override_dh_install_3
 
 override_dh_install_1:
+ifneq (,$(filter python-pyside-dbg, $(shell dh_listpackages)))
 	# Move the debug .so's right in place
 	$(shell rename 's/(debian\/tmp-dbg\/)(.*)\.so(.*)$$/debian\/tmp\/$$2_d.so$$3/'\
 	             debian/tmp-dbg/usr/lib/python*/*-packages/PySide/*.so)
@@ -116,16 +117,20 @@
 	# Move the PySideConfig snippets for the debug flavours in the standard install directory
 	$(shell rename 's/(debian\/tmp-dbg\/)(.*)$$/debian\/tmp\/$$2/'\
 	             debian/tmp-dbg/usr/lib/cmake/PySide-*/*-dbg.cmake)
+endif
+ifneq (,$(filter libpyside$(LIBPYSIDE_SOVERSION), $(shell dh_listpackages)))
 	# Setup the default version symbolic links
 	$(shell ln -s libpyside-python${DEFAULT_PY}.so.${LIBPYSIDE_SOVERSION} \
 	             debian/tmp/usr/lib/libpyside${LIBPYSIDE_SOVERSION}.so)
 	$(shell ln -s libpyside${LIBPYSIDE_SOVERSION}.so debian/tmp/usr/lib/libpyside.so)
+endif
 
 override_dh_install_2: override_dh_install_1
 	# Do the legacy install for the rest
-	dh_install --list-missing
+	dh_install -a --list-missing
 
 override_dh_install_3: override_dh_install_2
+ifneq (,$(filter python-pyside-dbg, $(shell dh_listpackages)))
 	# Move the debug library to the correct package.
 	$(shell rename 's/(debian\/libpyside${LIBPYSIDE_SOVERSION}\/)(.*)-dbg\.so(.*)$$/debian\/python-pyside-dbg\/$$2-dbg.so$$3/' \
 	              debian/libpyside${LIBPYSIDE_SOVERSION}/usr/lib/*-dbg.so*)
@@ -133,13 +138,8 @@
 	$(shell mkdir -p debian/python-pyside-dbg/usr/lib/cmake/`basename debian/libpyside-dev/usr/lib/cmake/PySide-*`; \
 	        rename 's/(debian\/libpyside-dev\/)(.*)-dbg\.cmake/debian\/python-pyside-dbg\/$$2-dbg.cmake/'\
 	              debian/libpyside-dev/usr/lib/cmake/PySide-*/*-dbg.cmake)
+endif
 
 override_dh_gencontrol:
 	debian/dh_pycmakedeps --modules-root=PySide/
 	dh_gencontrol
-
-binary: binary-arch binary-indep;
-
-binary-indep:
-	# Don't do anything as our binary-independent packages contain nothing.
-	dh binary-indep --after dh_install