r903 - in /zope-debhelper/trunk: autoscripts/postinst-dzinstance autoscripts/postrm-dzinstance debian/changelog dh_installzopeinstance

[kobold at users.alioth.debian.org]

Author: kobold
Date: Sun Jun 17 15:17:25 2007
New Revision: 903

URL: http://svn.debian.org/wsvn/pkg-zope/?sc=1&rev=903
Log:
Preparing the new upload.

Modified:
    zope-debhelper/trunk/autoscripts/postinst-dzinstance
    zope-debhelper/trunk/autoscripts/postrm-dzinstance
    zope-debhelper/trunk/debian/changelog
    zope-debhelper/trunk/dh_installzopeinstance

Modified: zope-debhelper/trunk/autoscripts/postinst-dzinstance
URL: http://svn.debian.org/wsvn/pkg-zope/zope-debhelper/trunk/autoscripts/postinst-dzinstance?rev=903&op=diff
==============================================================================
--- zope-debhelper/trunk/autoscripts/postinst-dzinstance (original)
+++ zope-debhelper/trunk/autoscripts/postinst-dzinstance Sun Jun 17 15:17:25 2007
@@ -2,6 +2,7 @@
 INSTANCE=#DZ-INSTANCE#
 ZVER=#DZ-ZVER#
 DATABASE=#DZ-DATABASE#
+USER=#DZ-USER#
 
 add_products()
 {
@@ -61,7 +62,7 @@
         # set the install policy to manual
         if dzhandle -z $ZVER make-instance -u "$user:$password" $INSTANCE \
             --addon-mode=#DZ-ADDON-MODE# --restart=#DZ-RESTARTPOLICY# -t #DZ-ADDON-TECHNIQUE# \
-            --service-port "$port" $ZEOSERVER #DZ-SKELETON#
+            --service-port=$port --service-user=#DZ-USER# #DZ-SKELETON# $ZEOSERVER
         then
             # overwrite password in debconf database
             db_set $PKG/admin-password ""

Modified: zope-debhelper/trunk/autoscripts/postrm-dzinstance
URL: http://svn.debian.org/wsvn/pkg-zope/zope-debhelper/trunk/autoscripts/postrm-dzinstance?rev=903&op=diff
==============================================================================
--- zope-debhelper/trunk/autoscripts/postrm-dzinstance (original)
+++ zope-debhelper/trunk/autoscripts/postrm-dzinstance Sun Jun 17 15:17:25 2007
@@ -17,11 +17,12 @@
     ;;
 
   remove)
+    dzhandle -z $ZVER zopectl $INSTANCE stop || true
+    dzhandle -z $ZVER remove-instance $INSTANCE || true
     if [ "$DATABASE" = "ZEO" ]; then
         dzhandle -z $ZVER zeoctl $INSTANCE stop || true
+        dzhandle -z $ZVER remove-zeoinstance $INSTANCE || true
     fi
-    dzhandle -z $ZVER zopectl $INSTANCE stop || true
-    dzhandle -z $ZVER remove-instance $INSTANCE || true
     ;;
 
   purge)

Modified: zope-debhelper/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zope/zope-debhelper/trunk/debian/changelog?rev=903&op=diff
==============================================================================
--- zope-debhelper/trunk/debian/changelog (original)
+++ zope-debhelper/trunk/debian/changelog Sun Jun 17 15:17:25 2007
@@ -1,3 +1,9 @@
+zope-debhelper (0.3.9) experimental; urgency=low
+
+  * dh_installzopeinstance: added a new field, Zope-User.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Sun, 17 Jun 2007 17:16:47 +0200
+
 zope-debhelper (0.3.8) experimental; urgency=low
 
   * dh_installzopeinstance: added support for a Zope-Database field in

Modified: zope-debhelper/trunk/dh_installzopeinstance
URL: http://svn.debian.org/wsvn/pkg-zope/zope-debhelper/trunk/dh_installzopeinstance?rev=903&op=diff
==============================================================================
--- zope-debhelper/trunk/dh_installzopeinstance (original)
+++ zope-debhelper/trunk/dh_installzopeinstance Sun Jun 17 15:17:25 2007
@@ -103,7 +103,7 @@
 
 sub addzopesubstvars {
 	my ($package, %fields) = @_;
-	addsubstvar($package, "zope:Depends", "zope-common (>= 0.5.34), zope" . $fields{'ZopeVersion'});
+	addsubstvar($package, "zope:Depends", "zope-common (>= 0.5.35), zope" . $fields{'ZopeVersion'});
 }
 
 my @autoscripts = ('config', 'preinst', 'postinst', 'prerm', 'postrm');
@@ -193,7 +193,9 @@
 			if (!$dzinstance{'Zope-Database'}) {
 				$dzinstance{'Zope-Database'} = 'ZODB';
 			}
-	
+			if (!$dzinstance{'Zope-User'}) {
+				$dzinstance{'Zope-User'} = 'zope';
+			}
 
 			if (!$dh{NOSCRIPTS}) {
 				foreach my $script (@autoscripts) {
@@ -208,6 +210,7 @@
 						   "s,#DZ-PRODUCTS#,$dzinstance{'Products'},;" .
 						   "s,#DZ-SKELETON#,$dzinstance{'Skeleton'},;".
 						   "s,#DZ-DATABASE#,$dzinstance{'Zope-Database'},;",
+						   "s,#DZ-USER#,$dzinstance{'Zope-User'},;",
 						  );
 				}
 			}