[Python-modules-commits] r17988 - in packages/shiboken/trunk/debian (compat control rules)

[odyx at users.alioth.debian.org]

    Date: Tuesday, August 2, 2011 @ 20:36:48
  Author: odyx
Revision: 17988

Update buildsystem (again) to cleanly separate arch-{all,indep}.

- Bump compat and B-D on debhelper to 8.
- Update rules to build documentation at the right moment.

Modified:
  packages/shiboken/trunk/debian/compat
  packages/shiboken/trunk/debian/control
  packages/shiboken/trunk/debian/rules

Modified: packages/shiboken/trunk/debian/compat
===================================================================
--- packages/shiboken/trunk/debian/compat	2011-08-02 20:36:40 UTC (rev 17987)
+++ packages/shiboken/trunk/debian/compat	2011-08-02 20:36:48 UTC (rev 17988)
@@ -1 +1 @@
-7
+8

Modified: packages/shiboken/trunk/debian/control
===================================================================
--- packages/shiboken/trunk/debian/control	2011-08-02 20:36:40 UTC (rev 17987)
+++ packages/shiboken/trunk/debian/control	2011-08-02 20:36:48 UTC (rev 17988)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Didier Raboud <odyx at debian.org>
-Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7.3.12), cmake (>= 2.8.2),
+Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 8~), cmake (>= 2.8.2),
  libqt4-dev (>= 4:4.7.0),
  libapiextractor-dev (>= 0.10.5),
  generatorrunner (>= 0.6.11), libgenrunner-dev (>= 0.6.11),

Modified: packages/shiboken/trunk/debian/rules
===================================================================
--- packages/shiboken/trunk/debian/rules	2011-08-02 20:36:40 UTC (rev 17987)
+++ packages/shiboken/trunk/debian/rules	2011-08-02 20:36:48 UTC (rev 17988)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with python2 --buildsystem=cmake --parallel $@
+	dh $@ --with python2 --buildsystem=cmake --parallel
 
 # Python versions (default is first)
 PYVERSIONS=$(shell pyversions -v -r)
@@ -17,7 +17,7 @@
 
 override_dh_auto_configure_dbg-%:
 	mkdir -p build-$*-dbg
-	dh_auto_configure --builddirectory=build-$*-dbg -- \
+	dh_auto_configure -a --builddirectory=build-$*-dbg -- \
 	-DCMAKE_BUILD_TYPE:STRING="Debug" \
 	-DCMAKE_SKIP_RPATH=true \
 	-DCMAKE_USE_PYTHON_VERSION="$*-dbg;$*_d;$*" \
@@ -35,12 +35,13 @@
 #### BUILD ####
 
 override_dh_auto_build: $(PYVERSIONS:%=override_dh_auto_build_dbg-%) $(PYVERSIONS:%=override_dh_auto_build-%)
+	dh_auto_build -i --builddirectory=build-$(DEFAULT_PY) -- doc
 
 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-$*
 
 override_dh_compress:
 	dh_compress -X.js
@@ -48,26 +49,27 @@
 #### INSTALL ####
 
 override_dh_auto_install: $(PYVERSIONS:%=override_dh_auto_install_dbg-%) $(PYVERSIONS:%=override_dh_auto_install-%)
+	dh_auto_install -i --builddirectory=build-$(DEFAULT_PY)
 
 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=shiboken-dbg --exclude=-dbg.so
+	dh_strip -a --dbg-package=shiboken-dbg --exclude=-dbg.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-$*
 
 #### CLEAN ####
 override_dh_auto_clean:
@@ -79,26 +81,31 @@
 #### DEBIAN INSTALL ####
 
 override_dh_install: override_dh_install_done
+	dh_install -i
 
 override_dh_install_real:
 	# Install the debug variant
 	dh_install --sourcedir=debian/tmp-dbg -pshiboken-dbg
 	
 	# Install the other variants
-	dh_install --list-missing --remaining-packages
+	dh_install -a --list-missing --remaining-packages
 
 override_dh_install_done: override_dh_install_real
+ifneq (,$(filter libshiboken-dev, $(shell dh_listpackages)))
 	# Setup the default version symbolic links
 	ln -sf libshiboken-python${DEFAULT_PY}.so \
 	               debian/libshiboken-dev/usr/lib/libshiboken.so
+endif
+ifneq (,$(filter shiboken-dbg, $(shell dh_listpackages)))
 	ln -sf libshiboken-python${DEFAULT_PY}-dbg.so \
 	               debian/shiboken-dbg/usr/lib/libshiboken-dbg.so
+endif
 
 #### Shared libs ####
 override_dh_makeshlibs: $(PYVERSIONS:%=override_dh_makeshlibs-%)
 	cat debian/libshiboken1.0.symbols-py* > debian/libshiboken1.0.symbols
 	# Package shiboken ships a usr/lib/generatorrunner/*.so plugin. No shared libs in there.
-	dh_makeshlibs -Nshiboken
+	dh_makeshlibs -a -Nshiboken
 
 override_dh_makeshlibs-%:
 	echo "libshiboken-python$*.so.1.0 libshiboken1.0 #MINVER#" > debian/libshiboken1.0.symbols-py$*
@@ -110,12 +117,3 @@
 	# g++ version is < 4.5, add related symbols
 	sed -e 's|^ _| (lt-g++4.5)_|g' debian/libshiboken1.0.symbols.g++-lt-4.5 >> debian/libshiboken1.0.symbols-py$*
 endif
-
-
-#### Docs ####
-binary: binary-arch binary-indep;
-
-binary-indep: binary-arch
-	dh binary-indep --until dh_auto_build
-	dh_auto_build -i --builddirectory=build-$(DEFAULT_PY) -- doc
-	dh binary-indep --after dh_auto_build