[Python-modules-commits] r9099 - in packages/cherrypy3/trunk/debian (changelog rules)

[bzed at users.alioth.debian.org]

    Date: Monday, July 20, 2009 @ 20:23:35
  Author: bzed
Revision: 9099

debian/rules: Fixed to work with dh >= 7.3.5 which will build with all
installed Python versions.

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

Modified: packages/cherrypy3/trunk/debian/changelog
===================================================================
--- packages/cherrypy3/trunk/debian/changelog	2009-07-20 12:14:29 UTC (rev 9098)
+++ packages/cherrypy3/trunk/debian/changelog	2009-07-20 20:23:35 UTC (rev 9099)
@@ -1,3 +1,10 @@
+cherrypy3 (3.1.1-3) UNRELEASED; urgency=low
+
+  * debian/rules: Fixed to work with dh >= 7.3.5 which will build with all
+    installed Python versions.
+
+ -- Bernd Zeimetz <bzed at debian.org>  Mon, 20 Jul 2009 22:18:04 +0200
+
 cherrypy3 (3.1.1-2) unstable; urgency=low
 
   * Making lintian happy release

Modified: packages/cherrypy3/trunk/debian/rules
===================================================================
--- packages/cherrypy3/trunk/debian/rules	2009-07-20 12:14:29 UTC (rev 9098)
+++ packages/cherrypy3/trunk/debian/rules	2009-07-20 20:23:35 UTC (rev 9099)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+PY_DEFAULT = $(strip $(shell pyversions -d))
+
 PATCH_DIR := debian/patches
 QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
 
@@ -27,9 +29,10 @@
 	dh install --before dh_pysupport
 
 	# the 'daemonization' helper should be made available properly
-	mv debian/python-cherrypy3/usr/lib/python*/*/cherrypy/cherryd \
+	mv debian/python-cherrypy3/usr/lib/$(PY_DEFAULT)/*/cherrypy/cherryd \
 		debian/python-cherrypy3/usr/sbin/
 	chmod a+x debian/python-cherrypy3/usr/sbin/cherryd
+	rm -f debian/python-cherrypy3/usr/lib/*/*/cherrypy/cherryd
 
 	# no additional licensing files wanted =)
 	find debian/python-cherrypy3/ -name LICENSE.txt -exec rm {} \;