r2684 - in zope.exceptions/trunk/debian (changelog rules)

[arnau at users.alioth.debian.org]

    Date: Friday, September 28, 2012 @ 02:47:00
  Author: arnau
Revision: 2684

Sync with zope.exceptions upload to unstable fixing RC bugs.

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

Modified: zope.exceptions/trunk/debian/changelog
===================================================================
--- zope.exceptions/trunk/debian/changelog	2012-09-28 02:44:35 UTC (rev 2683)
+++ zope.exceptions/trunk/debian/changelog	2012-09-28 02:47:00 UTC (rev 2684)
@@ -6,6 +6,16 @@
 
  -- Gediminas Paulauskas <menesis at pov.lt>  Tue, 26 Jun 2012 12:24:00 +0300
 
+zope.exceptions (3.6.1-3) unstable; urgency=low
+
+  * Team upload.
+  * debian/rules:
+    + Make sure that building fails if any python command fails.
+    + Remove setuptools from requires.txt for Python3 only as dh_python2
+      already take care of that. Closes: #688840.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Wed, 26 Sep 2012 15:27:35 +0900
+
 zope.exceptions (3.6.1-2) unstable; urgency=low
 
   * Team upload.

Modified: zope.exceptions/trunk/debian/rules
===================================================================
--- zope.exceptions/trunk/debian/rules	2012-09-28 02:44:35 UTC (rev 2683)
+++ zope.exceptions/trunk/debian/rules	2012-09-28 02:47:00 UTC (rev 2684)
@@ -8,21 +8,27 @@
 package3=python3-zope.exceptions
 
 override_dh_auto_build:
-	for pyvers in $(shell pyversions -vr); do \
+	set -ex; for pyvers in $(shell pyversions -vr); do \
 		python$$pyvers setup.py build; \
 	done
-	for pyvers in $(shell py3versions -sv); do \
+	set -ex; for pyvers in $(shell py3versions -sv); do \
 		python$$pyvers setup.py build; \
 	done
 
 override_dh_auto_install:
-	set -x; \
+	set -ex; \
 	for pyvers in $(shell pyversions -vr); do \
 		python$$pyvers setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/$(package); \
 	done
-	set -x; \
+	set -ex; \
 	for pyvers in $(shell py3versions -vs); do \
 		python$$pyvers setup.py install --install-layout=deb \
 			--root $(CURDIR)/debian/$(package3); \
 	done
+
+override_dh_gencontrol:
+	dh_gencontrol
+
+	# Workaround for dh_python3 not removing python-setuptools from requires.txt
+	find debian/$(package3) -name requires.txt -exec sed -i '/^setuptools$$/d' {} \;