[Python-apps-commits] r12279 - in packages/s3ql/trunk/debian (changelog rules)

[nikratio-guest at users.alioth.debian.org]

    Date: Friday, August 21, 2015 @ 21:19:38
  Author: nikratio-guest
Revision: 12279

Python extensions compiled for the debugging interpreter are now
actually shipped in the s3ql-dbg package (rather than the s3ql
package).

Modified:
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/rules

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2015-08-21 19:46:22 UTC (rev 12278)
+++ packages/s3ql/trunk/debian/changelog	2015-08-21 21:19:38 UTC (rev 12279)
@@ -4,6 +4,9 @@
   * Dropped patches/check_dev_fuse_perms.diff (integrated upstream).
   * Added /usr/bin/s3ql_remove_objects
   * Added build-depends on fuse and psmisc (required for unit tests).
+  * Python extensions compiled for the debugging interpreter are now
+    actually shipped in the s3ql-dbg package (rather than the s3ql
+    package).
 
  -- Nikolaus Rath <Nikolaus at rath.org>  Wed, 12 Aug 2015 14:57:22 -0700
 

Modified: packages/s3ql/trunk/debian/rules
===================================================================
--- packages/s3ql/trunk/debian/rules	2015-08-21 19:46:22 UTC (rev 12278)
+++ packages/s3ql/trunk/debian/rules	2015-08-21 21:19:38 UTC (rev 12279)
@@ -2,38 +2,34 @@
 # -*- makefile -*-
 
 #export DH_VERBOSE=1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-
-# NOTE:
-# Anyone willing to convert the package to pure debhelper
-# (i.e., without dh sequencer) and/or pybuild is very 
-# welcome to do so.
-
 %:
 	dh $@ --with python3,sphinxdoc
 
-override_dh_auto_build: build-stamp
+override_dh_auto_build: build_cython build_sphinx build_python
 
-build-stamp: build_cython build-python build_sphinx
-	touch $@
-
 build_cython:
 	dh_testdir
 	python3 setup.py build_cython
 	touch $@
 
-build-python: 
+build_sphinx: build_inplace
 	dh_testdir
-	python3-dbg setup.py build -g
-	python3 setup.py build -g
+	python3 setup.py build_sphinx
 	touch $@
 
-build_sphinx:
+build_inplace: build_cython
+	python3 setup.py build_ext --inplace
+	touch $@
+
+build_python: build_cython
 	dh_testdir
-	python3 setup.py build_ext --inplace build_sphinx
+	python3-dbg setup.py build -g
+	python3 setup.py build -g
 	touch $@
 
-override_dh_auto_install: 
+override_dh_auto_install:
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -66,8 +62,7 @@
 
 	# Install debugging extension and remove from regular package
 	(cd debian/s3ql; \
-	    find . -name "*_d.so" -or \
-	           -regextype posix-egrep -regex ".+-[a-z0-9]*d[a-z]*.so" \
+	    find . -regextype posix-egrep -regex ".+\\.[a-z]+-[0-9]{2,}[a-z]*d[a-z]*-$(DEB_HOST_MULTIARCH)\\.so" \
 	           -printf "%P\0" -delete) \
 	| xargs -0 dh_install --autodest -ps3ql-dbg