r706 - in zope3/trunk/debian: . patches
Fabio Tranchitella
kobold at alioth.debian.org
Mon Feb 19 08:58:03 CET 2007
Author: kobold
Date: 2007-02-19 08:58:03 +0100 (Mon, 19 Feb 2007)
New Revision: 706
Added:
zope3/trunk/debian/patches/zope.app.twisted-bbb.dpatch
Removed:
zope3/trunk/debian/patches/zope.app.twisted-bbb
zope3/trunk/debian/patches/zope.publisher.dpatch
Modified:
zope3/trunk/debian/changelog
zope3/trunk/debian/patches/00list
zope3/trunk/debian/patches/deb-zopeconf.dpatch
zope3/trunk/debian/patches/twisted-bug.dpatch
zope3/trunk/debian/rules
Log:
Changes for the new release.
Modified: zope3/trunk/debian/changelog
===================================================================
--- zope3/trunk/debian/changelog 2007-02-19 07:35:25 UTC (rev 705)
+++ zope3/trunk/debian/changelog 2007-02-19 07:58:03 UTC (rev 706)
@@ -1,8 +1,9 @@
zope3 (3.3.1-1) unstable; urgency=low
* New upstream release.
+ * debian/patches/zope.publisher.dpatch: removed, applyed upstream.
- -- Fabio Tranchitella <kobold at debian.org> Mon, 19 Feb 2007 08:33:22 +0100
+ -- Fabio Tranchitella <kobold at debian.org> Mon, 19 Feb 2007 08:48:58 +0100
zope3 (3.3.0-6) unstable; urgency=medium
Modified: zope3/trunk/debian/patches/00list
===================================================================
--- zope3/trunk/debian/patches/00list 2007-02-19 07:35:25 UTC (rev 705)
+++ zope3/trunk/debian/patches/00list 2007-02-19 07:58:03 UTC (rev 706)
@@ -1,4 +1,3 @@
deb-zopeconf
twisted-bug
zope.app.twisted-bbb
-zope.publisher
Modified: zope3/trunk/debian/patches/deb-zopeconf.dpatch
===================================================================
--- zope3/trunk/debian/patches/deb-zopeconf.dpatch 2007-02-19 07:35:25 UTC (rev 705)
+++ zope3/trunk/debian/patches/deb-zopeconf.dpatch 2007-02-19 07:58:03 UTC (rev 706)
@@ -6,9 +6,9 @@
. $(dirname $0)/DPATCH
@DPATCH@
-diff -urN zope3-3.3.0/z/Dependencies/zope.app.server-Zope-3.3.0/zope.app.server/mkzopeinstance.py zope3-3.3.0.debian/z/Dependencies/zope.app.server-Zope-3.3.0/zope.app.server/mkzopeinstance.py
---- zope3-3.3.0/z/Dependencies/zope.app.server-Zope-3.3.0/zope.app.server/mkzopeinstance.py 2006-09-21 12:39:44.000000000 +0200
-+++ zope3-3.3.0.debian/z/Dependencies/zope.app.server-Zope-3.3.0/zope.app.server/mkzopeinstance.py 2006-09-29 14:34:53.000000000 +0200
+diff -urN zope3-3.3.1/z/Dependencies/zope.app.server-Zope-3.3.1/zope.app.server/mkzopeinstance.py zope3-3.3.1.debian/z/Dependencies/zope.app.server-Zope-3.3.1/zope.app.server/mkzopeinstance.py
+--- zope3-3.3.1/z/Dependencies/zope.app.server-Zope-3.3.1/zope.app.server/mkzopeinstance.py 2006-09-21 12:39:44.000000000 +0200
++++ zope3-3.3.1.debian/z/Dependencies/zope.app.server-Zope-3.3.1/zope.app.server/mkzopeinstance.py 2006-09-29 14:34:53.000000000 +0200
@@ -117,8 +117,15 @@
options.password = password_manager.encodePassword(options.password)
@@ -155,9 +155,9 @@
+ if options.srvuser.count(":") != 1:
+ p.error("service user must be specified as user:group")
return options
-diff -urN zope3-3.3.0/z/Zope/zopeskel/etc/zdaemon.conf.in zope3-3.3.0.debian/z/Zope/zopeskel/etc/zdaemon.conf.in
---- zope3-3.3.0/z/Zope/zopeskel/etc/zdaemon.conf.in 2006-01-11 17:42:09.000000000 +0100
-+++ zope3-3.3.0.debian/z/Zope/zopeskel/etc/zdaemon.conf.in 2006-09-29 14:34:53.000000000 +0200
+diff -urN zope3-3.3.1/z/Zope/zopeskel/etc/zdaemon.conf.in zope3-3.3.1.debian/z/Zope/zopeskel/etc/zdaemon.conf.in
+--- zope3-3.3.1/z/Zope/zopeskel/etc/zdaemon.conf.in 2006-01-11 17:42:09.000000000 +0100
++++ zope3-3.3.1.debian/z/Zope/zopeskel/etc/zdaemon.conf.in 2006-09-29 14:34:53.000000000 +0200
@@ -1,4 +1,5 @@
%define INSTANCE <<INSTANCE_HOME>>
+%define ZOPE_USER <<ZOPE_USER>>
@@ -191,9 +191,9 @@
<logfile>
path STDOUT
-diff -urN zope3-3.3.0/z/Zope/zopeskel/etc/zope.conf.in zope3-3.3.0.debian/z/Zope/zopeskel/etc/zope.conf.in
---- zope3-3.3.0/z/Zope/zopeskel/etc/zope.conf.in 2006-08-16 05:03:05.000000000 +0200
-+++ zope3-3.3.0.debian/z/Zope/zopeskel/etc/zope.conf.in 2006-09-29 14:34:53.000000000 +0200
+diff -urN zope3-3.3.1/z/Zope/zopeskel/etc/zope.conf.in zope3-3.3.1.debian/z/Zope/zopeskel/etc/zope.conf.in
+--- zope3-3.3.1/z/Zope/zopeskel/etc/zope.conf.in 2006-08-16 05:03:05.000000000 +0200
++++ zope3-3.3.1.debian/z/Zope/zopeskel/etc/zope.conf.in 2006-09-29 14:34:53.000000000 +0200
@@ -1,6 +1,7 @@
# This is the configuration file for the Zope Application Server.
Modified: zope3/trunk/debian/patches/twisted-bug.dpatch
===================================================================
--- zope3/trunk/debian/patches/twisted-bug.dpatch 2007-02-19 07:35:25 UTC (rev 705)
+++ zope3/trunk/debian/patches/twisted-bug.dpatch 2007-02-19 07:58:03 UTC (rev 706)
@@ -6,9 +6,9 @@
. $(dirname $0)/DPATCH
@DPATCH@
-diff -urN zope3-3.3.0/z/Dependencies/zope.app.twisted-Zope-3.3.0/zope.app.twisted/http.py zope3-3.3.0.debian/z/Dependencies/zope.app.twisted-Zope-3.3.0/zope.app.twisted/http.py
---- zope3-3.3.0/z/Dependencies/zope.app.twisted-Zope-3.3.0/zope.app.twisted/http.py 2006-09-21 10:39:34.000000000 +0000
-+++ zope3-3.3.0.debian/z/Dependencies/zope.app.twisted-Zope-3.3.0/zope.app.twisted/http.py 2006-09-29 12:15:21.000000000 +0000
+diff -urN zope3-3.3.1/z/Dependencies/zope.app.twisted-Zope-3.3.1/zope.app.twisted/http.py zope3-3.3.1.debian/z/Dependencies/zope.app.twisted-Zope-3.3.1/zope.app.twisted/http.py
+--- zope3-3.3.1/z/Dependencies/zope.app.twisted-Zope-3.3.1/zope.app.twisted/http.py 2006-09-21 10:39:34.000000000 +0000
++++ zope3-3.3.1.debian/z/Dependencies/zope.app.twisted-Zope-3.3.1/zope.app.twisted/http.py 2006-09-29 12:15:21.000000000 +0000
@@ -52,13 +52,6 @@
return stream.readStream(req.stream, temp.write).addCallback(done)
Deleted: zope3/trunk/debian/patches/zope.app.twisted-bbb
===================================================================
--- zope3/trunk/debian/patches/zope.app.twisted-bbb 2007-02-19 07:35:25 UTC (rev 705)
+++ zope3/trunk/debian/patches/zope.app.twisted-bbb 2007-02-19 07:58:03 UTC (rev 706)
@@ -1,21 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Debian specific BBB;
-## DP: Author: Fabio Tranchitella
-
-. $(dirname $0)/DPATCH
-
- at DPATCH@
-diff -urN zope3-3.3.0/z/Dependencies/zope.app.twisted-Zope-3.3.0/zope.app.twisted/controller.py zope3-3.3.0.debian/z/Dependencies/zope.app.twisted-Zope-3.3.0/zope.app.twisted/controller.py
---- zope3-3.3.0/z/Dependencies/zope.app.twisted-Zope-3.3.0/zope.app.twisted/controller.py 1970-01-01 01:00:00.000000000 +0100
-+++ zope3-3.3.0.debian/z/Dependencies/zope.app.twisted-Zope-3.3.0/zope.app.twisted/controller.py 2006-10-06 09:37:49.000000000 +0200
-@@ -0,0 +1,9 @@
-+### BBB: debian specific
-+### I do not understand why upstream's zope3 does not ship with something like this.
-+import zope.deprecation
-+zope.deprecation.moved(
-+ 'zope.app.appsetup.controller',
-+ "Zope 3.5",
-+ )
-+
-+from zope.app.appsetup.controller import *
Copied: zope3/trunk/debian/patches/zope.app.twisted-bbb.dpatch (from rev 703, zope3/trunk/debian/patches/zope.app.twisted-bbb)
===================================================================
--- zope3/trunk/debian/patches/zope.app.twisted-bbb 2007-02-19 07:32:11 UTC (rev 703)
+++ zope3/trunk/debian/patches/zope.app.twisted-bbb.dpatch 2007-02-19 07:58:03 UTC (rev 706)
@@ -0,0 +1,21 @@
+#! /bin/sh -e
+##
+## DP: Debian specific BBB;
+## DP: Author: Fabio Tranchitella
+
+. $(dirname $0)/DPATCH
+
+ at DPATCH@
+diff -urN zope3-3.3.1/z/Dependencies/zope.app.twisted-Zope-3.3.1/zope.app.twisted/controller.py zope3-3.3.1.debian/z/Dependencies/zope.app.twisted-Zope-3.3.1/zope.app.twisted/controller.py
+--- zope3-3.3.1/z/Dependencies/zope.app.twisted-Zope-3.3.1/zope.app.twisted/controller.py 1970-01-01 01:00:00.000000000 +0100
++++ zope3-3.3.1.debian/z/Dependencies/zope.app.twisted-Zope-3.3.1/zope.app.twisted/controller.py 2006-10-06 09:37:49.000000000 +0200
+@@ -0,0 +1,9 @@
++### BBB: debian specific
++### I do not understand why upstream's zope3 does not ship with something like this.
++import zope.deprecation
++zope.deprecation.moved(
++ 'zope.app.appsetup.controller',
++ "Zope 3.5",
++ )
++
++from zope.app.appsetup.controller import *
Deleted: zope3/trunk/debian/patches/zope.publisher.dpatch
===================================================================
--- zope3/trunk/debian/patches/zope.publisher.dpatch 2007-02-19 07:35:25 UTC (rev 705)
+++ zope3/trunk/debian/patches/zope.publisher.dpatch 2007-02-19 07:58:03 UTC (rev 706)
@@ -1,21 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Fix for python2.4.4;
-## DP: Author: Upstream, http://mail.zope.org/pipermail/zope3-checkins/2006-October/028609.html
-
-. $(dirname $0)/DPATCH
-
- at DPATCH@
-diff -urN zope3-3.3.0/z/Dependencies/zope.publisher-Zope-3.3.0/zope.publisher/http.py zope3-3.3.0.debian/z/Dependencies/zope.publisher-Zope-3.3.0/zope.publisher/http.py
---- zope3-3.3.0/z/Dependencies/zope.publisher-Zope-3.3.0/zope.publisher/http.py 2006-09-21 12:39:44.000000000 +0200
-+++ zope3-3.3.0.debian/z/Dependencies/zope.publisher-Zope-3.3.0/zope.publisher/http.py 2006-09-29 14:34:53.000000000 +0200
-@@ -204,8 +204,8 @@
- self.cacheStream.write(data)
- return data
-
-- def readline(self):
-- data = self.stream.readline()
-+ def readline(self, size=None):
-+ data = self.stream.readline(size)
- self.cacheStream.write(data)
- return data
Modified: zope3/trunk/debian/rules
===================================================================
--- zope3/trunk/debian/rules 2007-02-19 07:35:25 UTC (rev 705)
+++ zope3/trunk/debian/rules 2007-02-19 07:58:03 UTC (rev 706)
@@ -254,13 +254,8 @@
dh_strip -a
dh_compress -a -X.rst -X.css
dh_fixperms -a
-
DH_PYCENTRAL=nomove dh_pycentral -p$(p_lib)
- dh_python -p$(p_lib) -V $(PV) /$(libdir)/{bin,lib}
-
dh_pycentral -p$(p_zif)
- dh_python -p$(p_zif)
-
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
More information about the pkg-zope-commits
mailing list