r2070 - in zope2.12/trunk/debian (5 files)

[mejo at users.alioth.debian.org]

    Date: Monday, March 8, 2010 @ 17:16:51
  Author: mejo
Revision: 2070

bump python version to 2.6

Modified:
  zope2.12/trunk/debian/changelog
  zope2.12/trunk/debian/control
  zope2.12/trunk/debian/patches/02_deb-zopeconf.patch
  zope2.12/trunk/debian/pyversions
  zope2.12/trunk/debian/rules

Modified: zope2.12/trunk/debian/changelog
===================================================================
--- zope2.12/trunk/debian/changelog	2010-02-10 09:10:48 UTC (rev 2069)
+++ zope2.12/trunk/debian/changelog	2010-03-08 17:16:51 UTC (rev 2070)
@@ -17,7 +17,7 @@
   [ Jonas Meurer ]
   * Remove pycentral cleanup code from debian/zopeZVER.preinst.in.
   * Remove exclusion of python2.5/2.6 code from dh_pysupport.
-  * Bump python version to 2.5.
+  * Bump python version to 2.6.
   * Remove useless tarball handling from debian/rules, distribute zope
     upstream tarball directly.
   * Migrate to quilt patch system from dpatch.
@@ -27,7 +27,7 @@
   * Removing myself from Uploaders. Unfortunately I don't have enough
     spare time to contribute.
 
- -- Bernd Zeimetz <bzed at debian.org>  Sun, 18 Oct 2009 13:08:47 +0200
+ -- Jonas Meurer <mejo at debian.org>  Mon, 08 Mar 2010 18:14:40 +0100
 
 zope2.11 (2.11.3-1) unstable; urgency=low
 

Modified: zope2.12/trunk/debian/control
===================================================================
--- zope2.12/trunk/debian/control	2010-02-10 09:10:48 UTC (rev 2069)
+++ zope2.12/trunk/debian/control	2010-03-08 17:16:51 UTC (rev 2070)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Fabio Tranchitella <kobold at debian.org>, Jonas Meurer <mejo at debian.org>
-Build-Depends: debhelper (>= 6.0.0), python-support (>= 0.5.3), python2.5-dev, python2.5, python, python-setuptools, zope-debhelper (>= 0.3.12), lsb-release, quilt (>= 0.40)
+Build-Depends: debhelper (>= 6.0.0), python-support (>= 0.5.3), python2.6-dev, python2.6, python, python-setuptools, zope-debhelper (>= 0.3.12), lsb-release, quilt (>= 0.40)
 Standards-Version: 3.8.3
-XS-Python-Version: 2.5
+XS-Python-Version: 2.6
 Homepage: http://www.zope.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope2.12/trunk
 Vcs-Svn: svn://svn.debian.org/pkg-zope/zope2.12/trunk
@@ -13,7 +13,7 @@
 Package: zope2.12
 Architecture: any
 Pre-Depends: zope-common (>= 0.5.49)
-Depends: python2.5, python-zope.traversing, python-zope.testbrowser, python-zope.testing, python-tz, python-docutils, lsb-base, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf | debconf-2.0
+Depends: python2.6, python-zope.traversing, python-zope.testbrowser, python-zope.testing, python-tz, python-docutils, lsb-base, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, debconf | debconf-2.0
 # FIXME: packages for the following modules are missing:
 #Acquisition
 #DateTime
@@ -45,7 +45,7 @@
 #zope.app.schema
 Provides: zope
 Suggests: python-unit, zope-book, zope-devguide
-XB-Python-Version: 2.5
+XB-Python-Version: 2.6
 Description: Open Source Web Application Server
  Zope is an open source web application server primarily written in
  the Python programming language. It features a transactional object

Modified: zope2.12/trunk/debian/patches/02_deb-zopeconf.patch
===================================================================
--- zope2.12/trunk/debian/patches/02_deb-zopeconf.patch	2010-02-10 09:10:48 UTC (rev 2069)
+++ zope2.12/trunk/debian/patches/02_deb-zopeconf.patch	2010-03-08 17:16:51 UTC (rev 2070)
@@ -44,7 +44,7 @@
 --- a/src/Zope2/utilities/copyzopeskel.py
 +++ b/src/ZOpe2/utilities/copyzopeskel.py
 @@ -1,3 +1,5 @@
-+#!/usr/bin/python2.5
++#!/usr/bin/python2.6
 +
  ##############################################################################
  #
@@ -126,7 +126,7 @@
 --- a/src/Zope2/utilities/mkzopeinstance.py
 +++ b/src/Zope2/utilities/mkzopeinstance.py
 @@ -1,3 +1,5 @@
-+#!/usr/bin/python2.5
++#!/usr/bin/python2.6
 +
  ##############################################################################
  #

Modified: zope2.12/trunk/debian/pyversions
===================================================================
--- zope2.12/trunk/debian/pyversions	2010-02-10 09:10:48 UTC (rev 2069)
+++ zope2.12/trunk/debian/pyversions	2010-03-08 17:16:51 UTC (rev 2070)
@@ -1 +1 @@
-2.5
+2.6

Modified: zope2.12/trunk/debian/rules
===================================================================
--- zope2.12/trunk/debian/rules	2010-02-10 09:10:48 UTC (rev 2069)
+++ zope2.12/trunk/debian/rules	2010-03-08 17:16:51 UTC (rev 2070)
@@ -43,7 +43,7 @@
 ZOPE	  := zope$(ZVER)
 PACKAGE	  := zope$(ZVER)
 DEBIAN    := $(CURDIR)/debian/$(PACKAGE)
-PYTHONVER := 2.5
+PYTHONVER := 2.6
 PYTHONBIN := /usr/bin/python$(PYTHONVER)
 
 distribution := $(shell lsb_release -is)