r1214 - in zope3/trunk/debian (5 files)

Fabio Tranchitella kobold at alioth.debian.org
Wed Mar 19 09:56:20 UTC 2008 

    Date: Wednesday, March 19, 2008 @ 09:56:19
  Author: kobold
Revision: 1214

* Removed patches applied upstream: debian/patches/twisted-bug.dpatch,
  debian/patches/zope.app.twisted-bbb.dpatch.

Modified:
  zope3/trunk/debian/changelog
  zope3/trunk/debian/patches/00list
  zope3/trunk/debian/patches/deb-zopeconf.dpatch
Deleted:
  zope3/trunk/debian/patches/twisted-bug.dpatch
  zope3/trunk/debian/patches/zope.app.twisted-bbb.dpatch

Modified: zope3/trunk/debian/changelog
===================================================================
--- zope3/trunk/debian/changelog	2008-03-19 08:39:49 UTC (rev 1213)
+++ zope3/trunk/debian/changelog	2008-03-19 09:56:19 UTC (rev 1214)
@@ -1,8 +1,10 @@
 zope3 (3.4.0~c1-1) experimental; urgency=low
 
   * New upstream release (candidate 1).
+  * Removed patches applied upstream: debian/patches/twisted-bug.dpatch,
+    debian/patches/zope.app.twisted-bbb.dpatch.
 
- -- Fabio Tranchitella <kobold at debian.org>  Wed, 19 Mar 2008 08:46:19 +0100
+ -- Fabio Tranchitella <kobold at debian.org>  Wed, 19 Mar 2008 10:55:52 +0100
 
 zope3 (3.3.1-5) unstable; urgency=low
 

Modified: zope3/trunk/debian/patches/00list
===================================================================
--- zope3/trunk/debian/patches/00list	2008-03-19 08:39:49 UTC (rev 1213)
+++ zope3/trunk/debian/patches/00list	2008-03-19 09:56:19 UTC (rev 1214)
@@ -1,3 +1 @@
 deb-zopeconf
-twisted-bug
-zope.app.twisted-bbb

Modified: zope3/trunk/debian/patches/deb-zopeconf.dpatch
===================================================================
--- zope3/trunk/debian/patches/deb-zopeconf.dpatch	2008-03-19 08:39:49 UTC (rev 1213)
+++ zope3/trunk/debian/patches/deb-zopeconf.dpatch	2008-03-19 09:56:19 UTC (rev 1214)
@@ -6,9 +6,9 @@
 . $(dirname $0)/DPATCH
 
 @DPATCH@
-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
+diff -urN zope3-3.4.0~c1/z/Dependencies/zope.app.server-Zope-3.4.0c1/zope.app.server/mkzopeinstance.py zope3-3.4.0~c1.debian/z/Dependencies/zope.app.server-Zope-3.4.0c1/zope.app.server/mkzopeinstance.py
+--- zope3-3.4.0~c1/z/Dependencies/zope.app.server-Zope-3.4.0c1/zope.app.server/mkzopeinstance.py	2008-01-31 23:38:32.000000000 +0100
++++ zope3-3.4.0~c1.debian/z/Dependencies/zope.app.server-Zope-3.4.0c1/zope.app.server/mkzopeinstance.py	2008-03-19 10:05:54.000000000 +0100
 @@ -117,8 +117,15 @@
  
          options.password = password_manager.encodePassword(options.password)
@@ -135,10 +135,12 @@
  
  SKELTARGET_MESSAGE = """\
  Please choose a directory in which you'd like to install Zope
-@@ -315,6 +371,12 @@
+@@ -314,7 +370,13 @@
+                  help=("set the name of the password manager"
                         " to be used for encode the password"))
      p.add_option("-u", "--user", dest="username", metavar="USER:PASSWORD",
-                  help="set the user name and password of the initial user")
+-                 help="set the user name and password of the initial user")
++                help="set the user name and password of the initial user")
 +    p.add_option("-l", "--layout", dest="layout", metavar="LAYOUT", default='zope',
 +                 help="layout to use while copying the skeleton files (`fhs' or `zope')")
 +    p.add_option("", "--service-user", dest="srvuser", metavar="USER:GROUP", default='zope:zope',
@@ -155,12 +157,12 @@
 +    if options.srvuser.count(":") != 1:
 +        p.error("service user must be specified as user:group")
      return options
-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
+diff -urN zope3-3.4.0~c1/z/Zope/zopeskel/etc/zdaemon.conf.in zope3-3.4.0~c1.debian/z/Zope/zopeskel/etc/zdaemon.conf.in
+--- zope3-3.4.0~c1/z/Zope/zopeskel/etc/zdaemon.conf.in	2006-01-11 17:42:09.000000000 +0100
++++ zope3-3.4.0~c1.debian/z/Zope/zopeskel/etc/zdaemon.conf.in	2008-03-19 10:53:18.000000000 +0100
 @@ -1,4 +1,5 @@
  %define INSTANCE <<INSTANCE_HOME>>
-+%define ZOPE_USER <<ZOPE_USER>>
++define ZOPE_USER <<ZOPE_USER>>
  %define LOGDIR $INSTANCE/log
  %define DATADIR $INSTANCE/var
  
@@ -191,9 +193,9 @@
  
    <logfile>
      path STDOUT
-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
+diff -urN zope3-3.4.0~c1/z/Zope/zopeskel/etc/zope.conf.in zope3-3.4.0~c1.debian/z/Zope/zopeskel/etc/zope.conf.in
+--- zope3-3.4.0~c1/z/Zope/zopeskel/etc/zope.conf.in	2006-12-20 20:57:24.000000000 +0100
++++ zope3-3.4.0~c1.debian/z/Zope/zopeskel/etc/zope.conf.in	2008-03-19 10:54:55.000000000 +0100
 @@ -1,6 +1,7 @@
  # This is the configuration file for the Zope Application Server.
  

Deleted: zope3/trunk/debian/patches/twisted-bug.dpatch
===================================================================
--- zope3/trunk/debian/patches/twisted-bug.dpatch	2008-03-19 08:39:49 UTC (rev 1213)
+++ zope3/trunk/debian/patches/twisted-bug.dpatch	2008-03-19 09:56:19 UTC (rev 1214)
@@ -1,25 +0,0 @@
-#! /bin/sh -e
-##
-## DP: Fix a bug in zope3 related to twisted.
-## 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/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)
-
--    # Oops, fix missing () in lambda in WrapperResource
--    def locateChild(self, ctx, segments):
--        x = self.hook(ctx)
--        if x is not None:
--            return x.addCallback(lambda data: (self.res, segments))
--        return self.res, segments
--
- def createHTTPFactory(db):
-     resource = wsgi.WSGIResource(WSGIPublisherApplication(db))
-     resource = log.LogWrapperResource(resource)

Deleted: zope3/trunk/debian/patches/zope.app.twisted-bbb.dpatch
===================================================================
--- zope3/trunk/debian/patches/zope.app.twisted-bbb.dpatch	2008-03-19 08:39:49 UTC (rev 1213)
+++ zope3/trunk/debian/patches/zope.app.twisted-bbb.dpatch	2008-03-19 09:56:19 UTC (rev 1214)
@@ -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.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 *

More information about the pkg-zope-commits mailing list