r2382 - in zope2.12/trunk/debian (changelog control)

[mejo at users.alioth.debian.org]

    Date: Saturday, October 8, 2011 @ 18:09:01
  Author: mejo
Revision: 2382

add versioned build-depends on python (>= 2.7.2-9~) to make sure that bug #644573 is fixed.

Modified:
  zope2.12/trunk/debian/changelog
  zope2.12/trunk/debian/control

Modified: zope2.12/trunk/debian/changelog
===================================================================
--- zope2.12/trunk/debian/changelog	2011-10-07 08:28:52 UTC (rev 2381)
+++ zope2.12/trunk/debian/changelog	2011-10-08 18:09:01 UTC (rev 2382)
@@ -36,7 +36,7 @@
     Thanks to Michael Mulich for help with investigation.
   * Remove Michael Mulich from Uploaders field.
   * Migrate the package from dh_pysupport to dh_python2.
-    - Bump build-depends on python-dev and depends on python to (>= 2.6.6-3~).
+    - Bump build-depends: python2.6-dev (>= 2.6.6-3~) and python (>= 2.7.2-9~).
     - Remove build-depends on python, as python-dev build-depends pull it in.
     - Remove debian/pyversions, add X-Python-Version: 2.6 to debian/control.
     - Add --with python2 to dh in debian/rules, to invoke dh_python2.
@@ -46,9 +46,8 @@
 
   TODO: WAIT FOR BUGS BEING FIXED:
   * bug#644003: Wait for namespace bug being fixed, bump (build-)depends on python-pkg-resources once in the archive
-  * bug#644573: Wait for dh_python2 being fixed, add versioned build-depends on python once in the archive
 
- -- Jonas Meurer <mejo at debian.org>  Fri, 07 Oct 2011 10:28:22 +0200
+ -- Jonas Meurer <mejo at debian.org>  Sat, 08 Oct 2011 20:07:32 +0200
 
 zope2.12 (2.12.11-1) unstable; urgency=low
 

Modified: zope2.12/trunk/debian/control
===================================================================
--- zope2.12/trunk/debian/control	2011-10-07 08:28:52 UTC (rev 2381)
+++ zope2.12/trunk/debian/control	2011-10-08 18:09:01 UTC (rev 2382)
@@ -3,23 +3,23 @@
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Jonas Meurer <mejo at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), lsb-release, python2.6-dev (>= 2.6.6-3~),
-               python-setuptools, python-pkg-resources, python-pip (>= 0.8),
+Build-Depends: debhelper (>= 7.0.50~), lsb-release, python (>= 2.7.2-9~),
+               python2.6-dev (>= 2.6.6-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
 Homepage: http://www.zope.org/
-X-Python-Version: 2.6
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.12/trunk
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-zope/zope2.12/trunk
 Vcs-Svn: svn://svn.debian.org/pkg-zope/zope2.12/trunk
 
 Package: zope2.12
 Architecture: any
 Pre-Depends: zope-common (>= 0.5.51)
-Depends: lsb-base, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
-         debconf | debconf-2.0, python2.6 (>= 2.6.6-3~),
-         python-clientform (>= 0.2.10), python-docutils (>= 0.7),
-         python-mechanize (>= 0.1.11), python-pkg-resources (>= 0.6.15),
-         python-tz
+Depends: lsb-base, ${shlibs:Depends}, debconf | debconf-2.0, ${misc:Depends},
+         ${python:Depends}, python-clientform (>= 0.2.10),
+         python-docutils (>= 0.7), python-mechanize (>= 0.1.11),
+         python-pkg-resources (>= 0.6.15), python-tz
 Provides: zope
 Suggests: python-unit, python-profiler
 Description: Open Source Web Application Server
@@ -41,7 +41,7 @@
 
 Package: zope2.12-sandbox
 Architecture: all
-Depends: ${zope:Depends}, ${misc:Depends}, debconf | debconf-2.0
+Depends: debconf | debconf-2.0, ${misc:Depends}, ${zope:Depends}
 Description: sandbox instance for the zope2.12 web application server
  This package creates a "sandbox" instance, getting all Zope
  products and packages available which are installed as Debian packages.