r351 - in zope3/trunk/debian: . patches

[Brian Sutherland]

Author: jinty-guest
Date: 2006-10-25 12:06:16 +0000 (Wed, 25 Oct 2006)
New Revision: 351

Added:
   zope3/trunk/debian/patches/zope.publisher.dpatch
Modified:
   zope3/trunk/debian/changelog
   zope3/trunk/debian/patches/00list
Log:
Backport upstream patch to fix bug 395151

Modified: zope3/trunk/debian/changelog
===================================================================
--- zope3/trunk/debian/changelog	2006-10-25 11:29:29 UTC (rev 350)
+++ zope3/trunk/debian/changelog	2006-10-25 12:06:16 UTC (rev 351)
@@ -1,3 +1,11 @@
+zope3 (3.3.0-4) UNRELEASED; urgency=low
+
+  * Apply patch as debian/patches/zope.publisher.dpatch from
+    http://mail.zope.org/pipermail/zope3-checkins/2006-October/028609.html.
+    (Closes: 395151)
+
+ -- Brian Sutherland <jinty at web.de>  Wed, 25 Oct 2006 10:17:07 +0200
+
 zope3 (3.3.0-3) unstable; urgency=low
 
   * Rebuild with updated debhelper. Closes: #391538.

Modified: zope3/trunk/debian/patches/00list
===================================================================
--- zope3/trunk/debian/patches/00list	2006-10-25 11:29:29 UTC (rev 350)
+++ zope3/trunk/debian/patches/00list	2006-10-25 12:06:16 UTC (rev 351)
@@ -1,3 +1,4 @@
 deb-zopeconf
 twisted-bug
 zope.app.twisted-bbb
+zope.publisher

Added: zope3/trunk/debian/patches/zope.publisher.dpatch
===================================================================
--- zope3/trunk/debian/patches/zope.publisher.dpatch	                        (rev 0)
+++ zope3/trunk/debian/patches/zope.publisher.dpatch	2006-10-25 12:06:16 UTC (rev 351)
@@ -0,0 +1,42 @@
+#! /bin/sh -e
+##
+## DP: Debian specific configuration;
+## DP: Author: Fabio Tranchitella
+
+. $(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
+#! /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