r2404 - in zope.testrunner/trunk/debian (changelog rules)

[arnau at users.alioth.debian.org]

    Date: Friday, October 14, 2011 @ 02:53:45
  Author: arnau
Revision: 2404

Clean up debian/rules and trap shell command errors if any as per Policy 4.6. Closes: #645184.

Modified:
  zope.testrunner/trunk/debian/changelog
  zope.testrunner/trunk/debian/rules

Modified: zope.testrunner/trunk/debian/changelog
===================================================================
--- zope.testrunner/trunk/debian/changelog	2011-10-14 01:54:54 UTC (rev 2403)
+++ zope.testrunner/trunk/debian/changelog	2011-10-14 02:53:45 UTC (rev 2404)
@@ -1,3 +1,11 @@
+zope.testrunner (4.0.3-3) unstable; urgency=low
+
+  * Team upload.
+  * debian/rules:
+    + Trap shell command errors if any as per Policy 4.6. Closes: #645184.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Fri, 14 Oct 2011 10:52:05 +0900
+
 zope.testrunner (4.0.3-2) unstable; urgency=low
 
   * Team upload.

Modified: zope.testrunner/trunk/debian/rules
===================================================================
--- zope.testrunner/trunk/debian/rules	2011-10-14 01:54:54 UTC (rev 2403)
+++ zope.testrunner/trunk/debian/rules	2011-10-14 02:53:45 UTC (rev 2404)
@@ -3,26 +3,27 @@
 %:
 	dh --with python2 --with python3 $@
 
-package=python-zope.testrunner
-package3=python3-zope.testrunner
+PACKAGE=python-zope.testrunner
+PACKAGE_PYTHON3=python3-zope.testrunner
 
+PYTHON3=$(shell py3versions -r)
+
 override_dh_auto_build:
-	for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py build; \
+	dh_auto_build -p$package
+
+	set -ex; \
+	for python in $(PYTHON3); do \
+		$$python setup.py build; \
 	done
-	for pyvers in $(shell py3versions -sv); do \
-		python$$pyvers setup.py build; \
-	done
 
 override_dh_auto_install:
-	set -x; \
-	for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/$(package); \
+	dh_auto_install -p$package --destdir=$(CURDIR)/debian/$(PACKAGE)
+
+	set -ex; \
+	for python in $(PYTHON3); do \
+		$$python setup.py install --install-layout=deb \
+			--root=$(CURDIR)/debian/$(PACKAGE_PYTHON3); \
 	done
-	set -x; \
-	for pyvers in $(shell py3versions -vs); do \
-		python$$pyvers setup.py install --install-layout=deb \
-			--root $(CURDIR)/debian/$(package3); \
-	done
-	mv $(CURDIR)/debian/$(package3)/usr/bin/zope-testrunner $(CURDIR)/debian/$(package3)/usr/bin/zope-testrunner3
+
+	mv $(CURDIR)/debian/$(PACKAGE_PYTHON3)/usr/bin/zope-testrunner \
+		$(CURDIR)/debian/$(PACKAGE_PYTHON3)/usr/bin/zope-testrunner3