r518 - in zope2.9/trunk: . debian debian/patches

[Fabio Tranchitella]

Author: kobold
Date: 2006-11-26 17:50:22 +0100 (Sun, 26 Nov 2006)
New Revision: 518

Added:
   zope2.9/trunk/Zope-2.9.6-final.tgz
Removed:
   zope2.9/trunk/Zope-2.9.5-final.tgz
Modified:
   zope2.9/trunk/debian/changelog
   zope2.9/trunk/debian/patches/deb-zopeconf.dpatch
   zope2.9/trunk/debian/rules
Log:
Changes for the new upstream release.


Deleted: zope2.9/trunk/Zope-2.9.5-final.tgz
===================================================================
(Binary files differ)

Copied: zope2.9/trunk/Zope-2.9.6-final.tgz (from rev 511, zope2.9/branches/upstream/current/Zope-2.9.6-final.tgz)

Modified: zope2.9/trunk/debian/changelog
===================================================================
--- zope2.9/trunk/debian/changelog	2006-11-25 18:54:32 UTC (rev 517)
+++ zope2.9/trunk/debian/changelog	2006-11-26 16:50:22 UTC (rev 518)
@@ -1,3 +1,9 @@
+zope2.9 (2.9.6-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Tue, 21 Nov 2006 20:34:53 +0100
+
 zope2.9 (2.9.5-3) UNRELEASED; urgency=medium
 
   * Depend on zope-debhelper (>= 0.3.3) to fix a bashism in the generated

Modified: zope2.9/trunk/debian/patches/deb-zopeconf.dpatch
===================================================================
--- zope2.9/trunk/debian/patches/deb-zopeconf.dpatch	2006-11-25 18:54:32 UTC (rev 517)
+++ zope2.9/trunk/debian/patches/deb-zopeconf.dpatch	2006-11-26 16:50:22 UTC (rev 518)
@@ -6,9 +6,9 @@
 . $(dirname $0)/DPATCH
 
 @DPATCH@
-diff -urN zope2.9-2.9.5/z/skel/etc/zope.conf.in zope2.9-2.9.5.debian/z/skel/etc/zope.conf.in
---- zope2.9-2.9.5/z/skel/etc/zope.conf.in	2006-10-02 17:53:36.000000000 +0200
-+++ zope2.9-2.9.5.debian/z/skel/etc/zope.conf.in	2006-11-02 21:02:15.000000000 +0100
+diff -urN zope2.9-2.9.6/z/skel/etc/zope.conf.in zope2.9-2.9.6.debian/z/skel/etc/zope.conf.in
+--- zope2.9-2.9.6/z/skel/etc/zope.conf.in	2006-10-02 17:53:36.000000000 +0200
++++ zope2.9-2.9.6.debian/z/skel/etc/zope.conf.in	2006-11-02 21:02:15.000000000 +0100
 @@ -24,6 +24,8 @@
  
  %define INSTANCE <<INSTANCE_HOME>>
@@ -35,9 +35,9 @@
    # force-connection-close on
  </http-server>
  
-diff -urN zope2.9-2.9.5/z/utilities/copyzopeskel.py zope2.9-2.9.5.debian/z/utilities/copyzopeskel.py
---- zope2.9-2.9.5/z/utilities/copyzopeskel.py	2006-10-02 17:53:35.000000000 +0200
-+++ zope2.9-2.9.5.debian/z/utilities/copyzopeskel.py	2006-11-02 21:02:15.000000000 +0100
+diff -urN zope2.9-2.9.6/z/utilities/copyzopeskel.py zope2.9-2.9.6.debian/z/utilities/copyzopeskel.py
+--- zope2.9-2.9.6/z/utilities/copyzopeskel.py	2006-10-02 17:53:35.000000000 +0200
++++ zope2.9-2.9.6.debian/z/utilities/copyzopeskel.py	2006-11-02 21:02:15.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.4
 +#!/usr/bin/python2.4
@@ -118,9 +118,9 @@
  def usage(stream, msg=None):
      if msg:
          print >>stream, msg
-diff -urN zope2.9-2.9.5/z/utilities/mkzopeinstance.py zope2.9-2.9.5.debian/z/utilities/mkzopeinstance.py
---- zope2.9-2.9.5/z/utilities/mkzopeinstance.py	2006-10-02 17:53:35.000000000 +0200
-+++ zope2.9-2.9.5.debian/z/utilities/mkzopeinstance.py	2006-11-02 21:16:48.000000000 +0100
+diff -urN zope2.9-2.9.6/z/utilities/mkzopeinstance.py zope2.9-2.9.6.debian/z/utilities/mkzopeinstance.py
+--- zope2.9-2.9.6/z/utilities/mkzopeinstance.py	2006-10-02 17:53:35.000000000 +0200
++++ zope2.9-2.9.6.debian/z/utilities/mkzopeinstance.py	2006-11-02 21:16:48.000000000 +0100
 @@ -22,6 +22,9 @@
  -d/--dir  -- the dir in which the instance home should be created
  -u/--user NAME:PASSWORD -- set the user name and password of the initial user

Modified: zope2.9/trunk/debian/rules
===================================================================
--- zope2.9/trunk/debian/rules	2006-11-25 18:54:32 UTC (rev 517)
+++ zope2.9/trunk/debian/rules	2006-11-26 16:50:22 UTC (rev 518)
@@ -18,7 +18,7 @@
 DEBIAN    := $(shell pwd)/debian/$(PACKAGE)
 PYTHONVER := 2.4
 PYTHONBIN := /usr/bin/python$(PYTHONVER)
-ZBASE     := Zope-2.9.5-final
+ZBASE     := Zope-2.9.6-final
 
 distribution := $(shell lsb_release -is)