r1672 - in zope2.12/trunk/debian (4 files)

[Jonas Meurer]

    Date: Wednesday, July 15, 2009 @ 23:58:02
  Author: mejo
Revision: 1672

build-depend on python-setuptools, fix patches

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

Modified: zope2.12/trunk/debian/changelog
===================================================================
--- zope2.12/trunk/debian/changelog	2009-07-06 00:52:16 UTC (rev 1671)
+++ zope2.12/trunk/debian/changelog	2009-07-15 23:58:02 UTC (rev 1672)
@@ -7,8 +7,9 @@
   * Remove useless tarball handling from debian/rules, distribute zope
     upstream tarball directly.
   * Migrate to quilt patch system from dpatch.
+  * Build-Depend on python-setuptools.
 
- -- Jonas Meurer <mejo at debian.org>  Mon, 06 Jul 2009 02:37:15 +0200
+ -- Jonas Meurer <mejo at debian.org>  Thu, 16 Jul 2009 01:22:21 +0200
 
 zope2.11 (2.11.3-1) unstable; urgency=low
 

Modified: zope2.12/trunk/debian/control
===================================================================
--- zope2.12/trunk/debian/control	2009-07-06 00:52:16 UTC (rev 1671)
+++ zope2.12/trunk/debian/control	2009-07-15 23:58:02 UTC (rev 1672)
@@ -3,7 +3,7 @@
 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>, Bernd Zeimetz <bzed at debian.org>
-Build-Depends: debhelper (>= 6.0.0), python-support (>= 0.5.3), python2.5-dev, python2.5, python, zope-debhelper (>= 0.3.12), lsb-release, quilt (>= 0.40)
+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)
 Standards-Version: 3.8.2
 XS-Python-Version: 2.5
 Homepage: http://www.zope.org/

Modified: zope2.12/trunk/debian/patches/01_webdav.patch
===================================================================
--- zope2.12/trunk/debian/patches/01_webdav.patch	2009-07-06 00:52:16 UTC (rev 1671)
+++ zope2.12/trunk/debian/patches/01_webdav.patch	2009-07-15 23:58:02 UTC (rev 1672)
@@ -2,8 +2,8 @@
 ##
 ## Fix quoting for webdav resources
 
---- src/webdav/davcmds.py
-+++ src/webdav/davcmds.py
+--- a/src/webdav/davcmds.py
++++ b/src/webdav/davcmds.py
 @@ -173,7 +173,7 @@
                      if dflag:
                          ob._p_deactivate()

Modified: zope2.12/trunk/debian/patches/02_deb-zopeconf.patch
===================================================================
--- zope2.12/trunk/debian/patches/02_deb-zopeconf.patch	2009-07-06 00:52:16 UTC (rev 1671)
+++ zope2.12/trunk/debian/patches/02_deb-zopeconf.patch	2009-07-15 23:58:02 UTC (rev 1672)
@@ -3,8 +3,8 @@
 ##
 ## Debian specific configuration;
 
---- src/Zope2/utilities/skel/etc/zope.conf.in
-+++ src/Zope2/utilities/skel/etc/zope.conf.in
+--- a/src/Zope2/utilities/skel/etc/zope.conf.in
++++ b/src/Zope2/utilities/skel/etc/zope.conf.in
 @@ -23,6 +23,9 @@
  # ZConfig "defines" used for later textual substitution
  
@@ -41,8 +41,8 @@
  #     storage 1
  #     name zeostorage
  #     var $INSTANCE/var
---- src/Zope2/utilities/copyzopeskel.py
-+++ src/ZOpe2/utilities/copyzopeskel.py
+--- a/src/Zope2/utilities/copyzopeskel.py
++++ b/src/ZOpe2/utilities/copyzopeskel.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.4
 +#!/usr/bin/env python2.5
@@ -123,8 +123,8 @@
  def usage(stream, msg=None):
      if msg:
          print >>stream, msg
---- src/Zope2/utilities/mkzopeinstance.py
-+++ src/Zope2/utilities/mkzopeinstance.py
+--- a/src/Zope2/utilities/mkzopeinstance.py
++++ b/src/Zope2/utilities/mkzopeinstance.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python2.4
 +#!/usr/bin/env python2.5