r1013 - in /zope2.10/trunk/debian: changelog patches/deb-zopeconf.dpatch

[kobold at users.alioth.debian.org]

Author: kobold
Date: Sun Nov  4 11:27:37 2007
New Revision: 1013

URL: http://svn.debian.org/wsvn/pkg-zope/?sc=1&rev=1013
Log:
New upload.

Modified:
    zope2.10/trunk/debian/changelog
    zope2.10/trunk/debian/patches/deb-zopeconf.dpatch

Modified: zope2.10/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zope/zope2.10/trunk/debian/changelog?rev=1013&op=diff
==============================================================================
--- zope2.10/trunk/debian/changelog (original)
+++ zope2.10/trunk/debian/changelog Sun Nov  4 11:27:37 2007
@@ -1,3 +1,11 @@
+zope2.10 (2.10.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/deb-zopeconf.dpatch: fixed argument handling.
+    (Closes: #440224)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Sun, 04 Nov 2007 12:25:25 +0100
+
 zope2.10 (2.10.4-2) unstable; urgency=low
 
   [ Jonas Meurer ]

Modified: zope2.10/trunk/debian/patches/deb-zopeconf.dpatch
URL: http://svn.debian.org/wsvn/pkg-zope/zope2.10/trunk/debian/patches/deb-zopeconf.dpatch?rev=1013&op=diff
==============================================================================
--- zope2.10/trunk/debian/patches/deb-zopeconf.dpatch (original)
+++ zope2.10/trunk/debian/patches/deb-zopeconf.dpatch Sun Nov  4 11:27:37 2007
@@ -234,12 +234,12 @@
                  usage(sys.stderr, "user must be specified as name:password")
                  sys.exit(2)
              user, password = arg.split(":", 1)
-+        if opt in ("--layout"):
++        if opt in ("--layout",):
 +            if not arg or arg not in ('fhs', 'zope'):
 +                usage(sys.stderr, "layout to use while copying the skeleton files (`fhs' or `zope')")
 +                sys.exit(2)
 +            layout = arg
-+        if opt in ("--service-user"):
++        if opt in ("--service-user",):
 +            if not arg:
 +                usage(sys.stderr, "service user must not be empty")
 +                sys.exit(2)
@@ -247,7 +247,7 @@
 +                usage(sys.stderr, "service user must be specified as user:group")
 +                sys.exit(2)
 +            srvuser = arg
-+        if opt in ("--service-port"):
++        if opt in ("--service-port",):
 +            if not arg:
 +                usage(sys.stderr, "service port must not be empty")
 +                sys.exit(2)
@@ -256,7 +256,7 @@
 +            except ValueError:
 +                usage(sys.stderr, "service port must be an integer")
 +                sys.exit(2)
-+        if opt in ("--zeo-server"):
++        if opt in ("--zeo-server",):
 +            if not arg:
 +                usage(sys.stderr, "zeo server must not be empty")
 +                sys.exit(2)