[Python-modules-commits] r16193 - in packages/importlib/trunk/debian (changelog control rules)

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

    Date: Wednesday, March 23, 2011 @ 20:01:39
  Author: fladi-guest
Revision: 16193

Move back to patching Depends during build.

Modified:
  packages/importlib/trunk/debian/changelog
  packages/importlib/trunk/debian/control
  packages/importlib/trunk/debian/rules

Modified: packages/importlib/trunk/debian/changelog
===================================================================
--- packages/importlib/trunk/debian/changelog	2011-03-23 19:18:32 UTC (rev 16192)
+++ packages/importlib/trunk/debian/changelog	2011-03-23 20:01:39 UTC (rev 16193)
@@ -1,15 +1,16 @@
 importlib (1.0.2-1) unstable; urgency=low
 
   * New upstream release.
-  * Manually define python versions  instead of using ${python:Depends}
-    to no interfere with future python (>= 2.7) (Closes: #606711).
+  * Patch python:Depends composed by dh_python2 to no interfere with future 
+    python (>= 2.7) (Closes: #606711).
   * Remove explicit b-d on quilt (already done through source/format).
   * Update to Debian policy 3.9.1 (nothing to do).
   * Change from cdbs to dh_python2.
   * Drop fix_setup.patch as it's now included upstream.
   * Set DPMT as Maintainer and myself as uploader.
+  * Bump B-D for debhelper to (>=7.0.50~) as we need overrides.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Thu, 20 Jan 2011 07:01:55 +0100
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Wed, 23 Mar 2011 21:00:45 +0100
 
 importlib (1.0.1-2) unstable; urgency=low
 

Modified: packages/importlib/trunk/debian/control
===================================================================
--- packages/importlib/trunk/debian/control	2011-03-23 19:18:32 UTC (rev 16192)
+++ packages/importlib/trunk/debian/control	2011-03-23 20:01:39 UTC (rev 16193)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Fladischer Michael <FladischerMichael at fladi.at>,
            David Watson <dwatson at debian.org>
-Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~)
 Standards-Version: 3.9.1
 X-Python-Version: <= 2.6
 Homepage: http://pypi.python.org/pypi/importlib/
@@ -13,7 +13,7 @@
 
 Package: python-importlib
 Architecture: all
-Depends: python (>= 2.6.6-3+squeeze3~), python2.6 | python2.5, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}
 Description: Backport of importlib.import_module() from Python 2.7
  This package contains the code from importlib as found in Python 2.7. It is
  provided so that people who wish to use importlib.import_module() with a

Modified: packages/importlib/trunk/debian/rules
===================================================================
--- packages/importlib/trunk/debian/rules	2011-03-23 19:18:32 UTC (rev 16192)
+++ packages/importlib/trunk/debian/rules	2011-03-23 20:01:39 UTC (rev 16193)
@@ -3,3 +3,8 @@
 %:
 	dh $@ --with python2
 
+.PHONY: override_dh_gencontrol
+override_dh_gencontrol:
+	sed -i '/python:Depends/s/python *(<<[^,]*, *//' debian/python-importlib.substvars
+	dh_gencontrol
+