r2308 - in zope-common/trunk (5 files)

[mejo at users.alioth.debian.org]

    Date: Tuesday, June 21, 2011 @ 11:11:13
  Author: mejo
Revision: 2308

add zope2.13 and zope2.14 to list of known zope versions

Added:
  zope-common/trunk/debian/source/
  zope-common/trunk/debian/source/format
Modified:
  zope-common/trunk/debian/changelog
  zope-common/trunk/debian/control
  zope-common/trunk/dzhandle

Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2011-06-21 11:09:16 UTC (rev 2307)
+++ zope-common/trunk/debian/changelog	2011-06-21 11:11:13 UTC (rev 2308)
@@ -8,8 +8,11 @@
   [ Jonas Meurer ]
   * Incorporate i18n NMU, thanks to Christian Perrier.
     (closes: #589771, #623326)
+  * Bump standards-version to 3.9.2, no changes required.
+  * Migrate package source to "3.0 (native)" format.
+  * Add zope2.13 and zope2.14 to known zope releases in dzhandle.
 
- -- Jonas Meurer <mejo at debian.org>  Thu, 16 Jun 2011 18:21:10 +0200
+ -- Jonas Meurer <mejo at debian.org>  Tue, 21 Jun 2011 13:10:35 +0200
 
 zope-common (0.5.50+nmu1) unstable; urgency=low
 

Modified: zope-common/trunk/debian/control
===================================================================
--- zope-common/trunk/debian/control	2011-06-21 11:09:16 UTC (rev 2307)
+++ zope-common/trunk/debian/control	2011-06-21 11:11:13 UTC (rev 2308)
@@ -5,7 +5,7 @@
 Uploaders: Fabio Tranchitella <kobold at debian.org>, Andrea Mennucci <mennucc1 at debian.org>, martin f. krafft <madduck at debian.org>, Matthias Klose <doko at debian.org>, Jonas Meurer <mejo at debian.org>, Bernd Zeimetz <bzed at debian.org>, Michael Mulich (pumazi) <michael.mulich at gmail.com>
 Build-Depends: debhelper (>= 6.0.0), po-debconf, lsb-release
 Build-Depends-Indep: docbook-to-man, python-support
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-zope/zope-common/trunk
 Vcs-Svn: svn://svn.debian.org/svn/pkg-zope/zope-common/trunk
 

Added: zope-common/trunk/debian/source/format
===================================================================
--- zope-common/trunk/debian/source/format	                        (rev 0)
+++ zope-common/trunk/debian/source/format	2011-06-21 11:11:13 UTC (rev 2308)
@@ -0,0 +1 @@
+3.0 (native)

Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2011-06-21 11:09:16 UTC (rev 2307)
+++ zope-common/trunk/dzhandle	2011-06-21 11:11:13 UTC (rev 2308)
@@ -86,6 +86,20 @@
       'zeoinstance': '/var/lib/zope2.12/zeo',
       'pyver': '2.6'
       },
+    { 'name': 'zope2.13',
+      'version': '2.13',
+      'prefix': '/usr/lib/zope2.13',
+      'instance': '/var/lib/zope2.13/instance',
+      'zeoinstance': '/var/lib/zope2.13/zeo',
+      'pyver': '2.6'
+      },
+    { 'name': 'zope2.14',
+      'version': '2.14',
+      'prefix': '/usr/lib/zope2.14',
+      'instance': '/var/lib/zope2.14/instance',
+      'zeoinstance': '/var/lib/zope2.14/zeo',
+      'pyver': '2.7'
+      },
     { 'name': 'zope3',
       'version': '3',
       'prefix': '/usr/lib/zope3',
@@ -1562,11 +1576,11 @@
         if self.options.zeoserver:
             cmd.append('--zeo-server=' + self.options.zeoserver)
 
-        if self.zope['version'] in ('2.12'):
+        if self.zope['version'] in ('2.12', '2.13', '2.14'):
             cmd.append('--python=' + os.path.join(self.zope['prefix'], 'bin', 'python'))
 
         # zope3's mkzopeinstance doesn't create the parents dir
-        if self.zope['version'] in ('2.11', '2.12', '3') and not os.path.isdir(self.instance_home):
+        if self.zope['version'] in ('2.11', '2.12', '2.13', '2.14', '3') and not os.path.isdir(self.instance_home):
             os.makedirs(self.instance_home)
             os.rmdir(self.instance_home)