[Python-modules-commits] r19186 - in packages/pyside-mobility/trunk/debian (control rules)

[odyx at users.alioth.debian.org]

    Date: Monday, November 7, 2011 @ 14:12:34
  Author: odyx
Revision: 19186

Cleanly separate binary-{indep,all} targets.

Modified:
  packages/pyside-mobility/trunk/debian/control
  packages/pyside-mobility/trunk/debian/rules

Modified: packages/pyside-mobility/trunk/debian/control
===================================================================
--- packages/pyside-mobility/trunk/debian/control	2011-11-07 14:12:17 UTC (rev 19185)
+++ packages/pyside-mobility/trunk/debian/control	2011-11-07 14:12:34 UTC (rev 19186)
@@ -80,7 +80,7 @@
  This package contains the debugging symbols.
 
 Package: python-qtmobility-dev
-Architecture: all
+Architecture: any
 Priority: extra
 Section: libdevel
 Depends: ${pycmakedeps:Depends}, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},

Modified: packages/pyside-mobility/trunk/debian/rules
===================================================================
--- packages/pyside-mobility/trunk/debian/rules	2011-11-07 14:12:17 UTC (rev 19185)
+++ packages/pyside-mobility/trunk/debian/rules	2011-11-07 14:12:34 UTC (rev 19186)
@@ -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)
@@ -13,7 +13,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=ON \
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
 	-DCMAKE_SKIP_RPATH=true \
@@ -22,7 +22,7 @@
 
 override_dh_auto_configure-%:
 	mkdir -p build-$*
-	dh_auto_configure --builddirectory=build-$* -- \
+	dh_auto_configure -a --builddirectory=build-$* -- \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
 	-DCMAKE_BUILD_TYPE:STRING="Release" \
 	-DCMAKE_SKIP_RPATH=true \
@@ -35,35 +35,35 @@
 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-$*
 
 #### STRIP ####
 override_dh_strip:
-	dh_strip --dbg-package=python-qtmobility-dbg --exclude=-dbg.so --exclude=_d.so
+	dh_strip -a --dbg-package=python-qtmobility-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-%:
 	# Run tests in fake X Server in a non-blocking way
-	- xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*-dbg
+	- xvfb-run -a -s -noreset dh_auto_test -a --builddirectory=build-$*-dbg
 
 override_dh_auto_test-%:
 	# Run tests in fake X Server in a non-blocking way
-	- xvfb-run -a -s -noreset dh_auto_test --builddirectory=build-$*
+	- xvfb-run -a -s -noreset dh_auto_test -a --builddirectory=build-$*
 
 #### usr/share/doc/* symlinks ####
 override_dh_link:
@@ -85,17 +85,16 @@
 override_dh_install: override_dh_install_2
 
 override_dh_install_1:
+ifneq (,$(filter python-qtmobility-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/QtMobility/*.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_gencontrol:
 	debian/dh_pycmakedeps --modules-root=QtMobility/
 	dh_gencontrol
-
-binary: binary-arch binary-indep;