r2680 - in zope.interface/trunk/debian (changelog rules)

[arnau at users.alioth.debian.org]

    Date: Wednesday, September 26, 2012 @ 05:53:26
  Author: arnau
Revision: 2680

Remove setuptools from requires.txt for Python3. Closes: #688838.

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

Modified: zope.interface/trunk/debian/changelog
===================================================================
--- zope.interface/trunk/debian/changelog	2012-09-26 02:46:50 UTC (rev 2679)
+++ zope.interface/trunk/debian/changelog	2012-09-26 05:53:26 UTC (rev 2680)
@@ -1,11 +1,15 @@
-zope.interface (3.6.2-2) UNRELEASED; urgency=low
+zope.interface (3.6.2-2) unstable; urgency=low
 
-  * debian/rules: make sure that building fails if any python command fails.
+  * 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: #688838.
   * debian/python-zope.interface-dbg.postinst:
     + Properly handle upgrade from Squeeze of /usr/share/doc to a symlink.
       Closes: #687878.
 
- -- Arnaud Fontaine <arnau at debian.org>  Wed, 26 Sep 2012 09:22:31 +0900
+ -- Arnaud Fontaine <arnau at debian.org>  Wed, 26 Sep 2012 12:24:31 +0900
 
 zope.interface (3.6.2-1) unstable; urgency=low
 

Modified: zope.interface/trunk/debian/rules
===================================================================
--- zope.interface/trunk/debian/rules	2012-09-26 02:46:50 UTC (rev 2679)
+++ zope.interface/trunk/debian/rules	2012-09-26 05:53:26 UTC (rev 2680)
@@ -71,6 +71,9 @@
 	find debian/$(package3)-dbg ! -type d ! -name '*.so' | xargs rm -f
 	find debian/$(package3)-dbg -depth -empty -exec rmdir {} \;
 
+	# Workaround for dh_python3 not removing python-setuptools from requires.txt
+	find debian/$(package3) -name requires.txt -exec sed -i '/^setuptools$$/d' {} \;
+
 override_dh_installdocs:
 	dh_installdocs -p$(package) README.txt
 	dh_installdocs -p$(package)-dbg --link-doc=$(package)