r2505 - in zope2.12/branches/squeeze (4 files)

[mejo at users.alioth.debian.org]

    Date: Monday, October 24, 2011 @ 13:31:55
  Author: mejo
Revision: 2505

migrate squeeze backport back to python-support

Added:
  zope2.12/branches/squeeze/pyversions
Modified:
  zope2.12/branches/squeeze/debian/changelog
  zope2.12/branches/squeeze/debian/control
  zope2.12/branches/squeeze/debian/rules

Modified: zope2.12/branches/squeeze/debian/changelog
===================================================================
--- zope2.12/branches/squeeze/debian/changelog	2011-10-22 13:54:59 UTC (rev 2504)
+++ zope2.12/branches/squeeze/debian/changelog	2011-10-24 13:31:55 UTC (rev 2505)
@@ -1,11 +1,13 @@
 zope2.12 (2.12.20-1~bpo60+1) squeeze-backports; urgency=low
 
   * Build for squeeze backports.
-  * Downgrade versioned build-depends on python to (>= 2.6.6-3~) in order to
-    make zope2.12 build in squeeze. Reason for higher versioned build-depends
-    was bug#644573, which is not present in squeeze anyway.
+  * Migrate back to python-support for Debian Squeeze and Ubuntu Natty support.
+    - Remove versioned build-depends on python and python2.6-dev.
+    - Readd debian/pversions, add XS-Python-Version: 2.6 to debian/control.
+    - Remove --with python2 from dh in debian/rules, dh_pysupport is invoked
+      automatically.
 
- -- Jonas Meurer <mejo at debian.org>  Sat, 22 Oct 2011 15:51:47 +0200
+ -- Jonas Meurer <mejo at debian.org>  Sun, 23 Oct 2011 23:18:33 +0200
 
 zope2.12 (2.12.20-1) unstable; urgency=low
 

Modified: zope2.12/branches/squeeze/debian/control
===================================================================
--- zope2.12/branches/squeeze/debian/control	2011-10-22 13:54:59 UTC (rev 2504)
+++ zope2.12/branches/squeeze/debian/control	2011-10-24 13:31:55 UTC (rev 2505)
@@ -4,12 +4,12 @@
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Jonas Meurer <mejo at debian.org>,
            Arnaud Fontaine <arnau at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), lsb-release, python (>=2.6.6-3~),
-               python2.6-dev (>= 2.6.6-3~), python-setuptools,
+Build-Depends: debhelper (>= 7.0.50~), lsb-release, python, python2.6-dev,
+               python-support (>= 0.5.3), python-setuptools,
                python-pkg-resources, python-pip (>= 0.8),
                zope-debhelper (>= 0.3.12)
 Standards-Version: 3.9.2
-X-Python-Version: 2.6
+XS-Python-Version: 2.6
 Homepage: http://www.zope.org/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-zope/zope2.12/trunk
 Vcs-Svn: svn://svn.debian.org/pkg-zope/zope2.12/trunk
@@ -18,7 +18,7 @@
 Architecture: any
 Pre-Depends: zope-common (>= 0.5.51)
 Depends: lsb-base, ${shlibs:Depends}, debconf | debconf-2.0, ${misc:Depends},
-         ${python:Depends}, python-clientform (>= 0.2.10),
+         ${python:Depends}, python2.6, python-clientform (>= 0.2.10),
          python-docutils (>= 0.7), python-mechanize (>= 0.1.11),
          python-pkg-resources (>= 0.6.16-1.1) | 
          python-pkg-resources (<< 0.6.15), python-tz, python-initgroups

Modified: zope2.12/branches/squeeze/debian/rules
===================================================================
--- zope2.12/branches/squeeze/debian/rules	2011-10-22 13:54:59 UTC (rev 2504)
+++ zope2.12/branches/squeeze/debian/rules	2011-10-24 13:31:55 UTC (rev 2505)
@@ -35,7 +35,7 @@
 	rm -rf $(CURDIR)/$(SRC_DIR)
 
 %:
-	dh --with python2 $@ 
+	dh $@ 
 
 override_dh_auto_clean:
 	for f in debian/*.in; do \

Added: zope2.12/branches/squeeze/pyversions
===================================================================
--- zope2.12/branches/squeeze/pyversions	                        (rev 0)
+++ zope2.12/branches/squeeze/pyversions	2011-10-24 13:31:55 UTC (rev 2505)
@@ -0,0 +1 @@
+2.6