r1687 - in zope2.11/trunk/debian (changelog zopeZVER.init.in)

[Jonas Meurer]

    Date: Sunday, August 9, 2009 @ 14:07:46
  Author: mejo
Revision: 1687

add support to start particular instance|zeoserver to initscript, bump (build|pre)-depends on zope-debhelper and zope-common

Modified:
  zope2.11/trunk/debian/changelog
  zope2.11/trunk/debian/zopeZVER.init.in

Modified: zope2.11/trunk/debian/changelog
===================================================================
--- zope2.11/trunk/debian/changelog	2009-08-09 14:07:41 UTC (rev 1686)
+++ zope2.11/trunk/debian/changelog	2009-08-09 14:07:46 UTC (rev 1687)
@@ -2,13 +2,12 @@
 
   * New upstream release, fixes two vulnerabilities in the ZEO network
     protocol: CVE-2009-0668 and CVE-2009-0669. (closes: #540463)
-  * set urgency=high for that reason.
   * Add support to start a particular instance to initscript.
-  * Build-Depend on zope-debhelper (>= 0.3.14) to use that new feature.
-    (closes: #540158)
-  * 
+  * Bump pre-depends on zope-common to 0.5.49 and build-depends on debhelper
+    to 0.3.14 to use invoke-rc.d in maintainer scripts. (closes: #540158)
+  * Set urgency=high as this upload fixes two serious bugs.
 
- -- Jonas Meurer <mejo at debian.org>  Sat, 08 Aug 2009 13:51:45 +0200
+ -- Jonas Meurer <mejo at debian.org>  Sun, 09 Aug 2009 16:00:28 +0200
 
 zope2.11 (2.11.3-1) unstable; urgency=low
 

Modified: zope2.11/trunk/debian/zopeZVER.init.in
===================================================================
--- zope2.11/trunk/debian/zopeZVER.init.in	2009-08-09 14:07:41 UTC (rev 1686)
+++ zope2.11/trunk/debian/zopeZVER.init.in	2009-08-09 14:07:46 UTC (rev 1687)
@@ -21,8 +21,8 @@
 	. /etc/default/zope$ZVER
 fi
 
-if [ -n "$2" ]; then
-    ZEOSERVERS="$2"
+if [ -n "$2" -a "${2%ZEOSERVER=}" != "$2" ]; then
+    ZEOSERVERS="${2#ZEOSERVER=}"
 elif [ "$ZEOSERVERS" = "NONE" -o "$ZEOSERVERS" = "" ]; then
     ZEOSERVERS=''
     log_warning_msg "Zope$ZVER: ZEO servers have been disabled, edit /etc/default/zope$ZVER to enable them."
@@ -30,8 +30,8 @@
     ZEOSERVERS='*'
 fi
 
-if [ -n "$2" ]; then
-    INSTANCES="$2"
+if [ -n "$2" -a "${2#INSTANCE=}" != "$2" ]; then
+    INSTANCES="${2#INSTANCE=}"
 elif [ "$INSTANCES" = "NONE" -o "$INSTANCES" = "" ]; then
     INSTANCES=''
     log_warning_msg "Zope$ZVER: instances have been disabled, edit /etc/default/zope$ZVER to enable them."