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

[Brian Sutherland]

    Date: Monday, July 20, 2009 @ 07:50:34
  Author: jinty-guest
Revision: 1674

Modify patch from Michael Bienia to build on Lenny

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

Modified: zope.interface/trunk/debian/changelog
===================================================================
--- zope.interface/trunk/debian/changelog	2009-07-20 06:49:19 UTC (rev 1673)
+++ zope.interface/trunk/debian/changelog	2009-07-20 07:50:34 UTC (rev 1674)
@@ -1,13 +1,19 @@
 zope.interface (3.5.1-3) unstable; urgency=low
 
+  [ Michael Bienia ]
   * debian/rules:
     Use the macros from python.mk to determine the library path for python 2.5
-    and python 2.6.
+    and python 2.6, Closes: #537581.
   * debian/control:
     Bump the needed version of python-all-dev for this.
 
- -- Michael Bienia <geser at ubuntu.com>  Sun, 19 Jul 2009 16:47:04 +0200
+  [ Brian Sutherland ]
+  * debian/rules, debian/control: Changes to above patch to be buildable on
+    Lenny. Remove the python.mk include, van.pydeb already includes this
+    conditionally. Revert above bump of python-all-dev.
 
+ -- Brian Sutherland <brian at vanguardistas.net>  Mon, 20 Jul 2009 09:35:10 +0200
+
 zope.interface (3.5.1-2) unstable; urgency=low
 
   * Fix maintainers/upload.

Modified: zope.interface/trunk/debian/control
===================================================================
--- zope.interface/trunk/debian/control	2009-07-20 06:49:19 UTC (rev 1673)
+++ zope.interface/trunk/debian/control	2009-07-20 07:50:34 UTC (rev 1674)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Brian Sutherland <brian at vanguardistas.net>, Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.5.4-1~), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-van.pydeb
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-setuptools (>= 0.6b3), python-van.pydeb
 Standards-Version: 3.8.2
 XS-Python-Version: all
 XS-Vcs-Svn: svn://svn.debian.org/pkg-zope/zope.interface/trunk

Modified: zope.interface/trunk/debian/rules
===================================================================
--- zope.interface/trunk/debian/rules	2009-07-20 06:49:19 UTC (rev 1673)
+++ zope.interface/trunk/debian/rules	2009-07-20 07:50:34 UTC (rev 1674)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 include /usr/share/python-van.pydeb/rules_templates/rules.1.mk
-include /usr/share/python/python.mk
 
 post-install-python%:
 	install -D -m 644 src/zope/__init__.py \