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

[arnau at users.alioth.debian.org]

    Date: Friday, September 28, 2012 @ 02:44:35
  Author: arnau
Revision: 2683

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

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

Modified: zope.interface/trunk/debian/changelog
===================================================================
--- zope.interface/trunk/debian/changelog	2012-09-28 02:39:11 UTC (rev 2682)
+++ zope.interface/trunk/debian/changelog	2012-09-28 02:44:35 UTC (rev 2683)
@@ -1,6 +1,22 @@
-zope.interface (3.6.2-2) unstable; urgency=low
+zope.interface (3.6.2-1) UNRELEASED; urgency=low
 
+  * New upstream release
+  * Remove backported patches.
+
+ -- Brian Sutherland <brian at vanguardistas.net>  Wed, 25 May 2011 10:36:38 +0200
+
+zope.interface (3.6.1-3) unstable; urgency=low
+
   * Team upload.
+  * Remove setuptools from requires.txt for Python3 (#688838) by overriding
+    dh_gencontrol rather than dh_install, otherwise python3-pkg-resources is
+    not added as Depends.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Wed, 26 Sep 2012 16:16:22 +0900
+
+zope.interface (3.6.1-2) 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
@@ -11,13 +27,6 @@
 
  -- Arnaud Fontaine <arnau at debian.org>  Wed, 26 Sep 2012 12:24:31 +0900
 
-zope.interface (3.6.2-1) unstable; urgency=low
-
-  * New upstream release
-  * Remove backported patches.
-
- -- Brian Sutherland <brian at vanguardistas.net>  Wed, 25 May 2011 10:36:38 +0200
-
 zope.interface (3.6.1-1) unstable; urgency=low
 
   * Team upload.

Modified: zope.interface/trunk/debian/rules
===================================================================
--- zope.interface/trunk/debian/rules	2012-09-28 02:39:11 UTC (rev 2682)
+++ zope.interface/trunk/debian/rules	2012-09-28 02:44:35 UTC (rev 2683)
@@ -71,6 +71,9 @@
 	find debian/$(package3)-dbg ! -type d ! -name '*.so' | xargs rm -f
 	find debian/$(package3)-dbg -depth -empty -exec rmdir {} \;
 
+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' {} \;