[Python-modules-commits] r20359 - in packages/flufl.enum/trunk/debian (changelog rules)

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

    Date: Monday, February 6, 2012 @ 20:02:11
  Author: warsaw-guest
Revision: 20359

* debian/rules:
  - Build and install Python 3 versions via % expansion targets instead
    of for loops in override targets.
  - Remove test target debugging output when DEB_BUILD_OPTIONS=nocheck.
  - Remove questionable workaround for bug 618367.

Modified:
  packages/flufl.enum/trunk/debian/changelog
  packages/flufl.enum/trunk/debian/rules

Modified: packages/flufl.enum/trunk/debian/changelog
===================================================================
--- packages/flufl.enum/trunk/debian/changelog	2012-02-06 19:22:03 UTC (rev 20358)
+++ packages/flufl.enum/trunk/debian/changelog	2012-02-06 20:02:11 UTC (rev 20359)
@@ -1,3 +1,13 @@
+flufl.enum (3.3.1-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - Build and install Python 3 versions via % expansion targets instead
+      of for loops in override targets.
+    - Remove test target debugging output when DEB_BUILD_OPTIONS=nocheck.
+    - Remove questionable workaround for bug 618367.
+
+ -- Barry Warsaw <barry at python.org>  Fri, 03 Feb 2012 18:28:05 -0500
+
 flufl.enum (3.3.1-1) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/flufl.enum/trunk/debian/rules
===================================================================
--- packages/flufl.enum/trunk/debian/rules	2012-02-06 19:22:03 UTC (rev 20358)
+++ packages/flufl.enum/trunk/debian/rules	2012-02-06 20:02:11 UTC (rev 20359)
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DH_VERBOSE=1
+
 PYTHON2=$(shell pyversions -vr)
 PYTHON3=$(shell py3versions -vr)
 
@@ -11,23 +13,19 @@
 	python$* setup.py test -vv
 
 override_dh_auto_test: $(PYTHON2:%=test-python%) $(PYTHON3:%=test-python%)
-else
-	@echo "nocheck set, skipping tests"
 endif
 
-override_dh_auto_build:
+build-python%:
+	python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
 	dh_auto_build
-	set -ex; for py in $(PYTHON3) ; do \
-		python$$py setup.py build; \
-	done;
 
-override_dh_auto_install:
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
 	dh_auto_install
-	set -ex; for py in $(PYTHON3) ; do \
-		python$$py setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
-	done;
-	# Debian bug #618367
-	rm -rf debian/*/usr/lib/python*/*-packages/flufl.enum.egg-info
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k flufl/enum/NEWS.rst
@@ -38,5 +36,4 @@
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf build/sphinx
-	rm -rf *.egg-info
+	rm -rf build