r1064 - in zope-debhelper/trunk (debian/changelog dh_installzope)

[Fabio Tranchitella]

    Date: Friday, November 30, 2007 @ 17:06:18
  Author: kobold
Revision: 1064

* dh_installzopeinstance: fixed a bug, the default user for the instance
  should be zope:zope. (Closes: #453180)
* dh_installzope: add a Package field in the multiple dzproduct files mode.
* dh_installzope: smartly handle ZopeVersions in a multiple dzproduct files
  mode.

Modified:
  zope-debhelper/trunk/debian/changelog
  zope-debhelper/trunk/dh_installzope

Modified: zope-debhelper/trunk/debian/changelog
===================================================================
--- zope-debhelper/trunk/debian/changelog	2007-11-30 16:44:42 UTC (rev 1063)
+++ zope-debhelper/trunk/debian/changelog	2007-11-30 17:06:18 UTC (rev 1064)
@@ -1,11 +1,14 @@
 zope-debhelper (0.3.11) unstable; urgency=high
 
+  * dh_installzopeinstance: fixed a bug, the default user for the instance
+    should be zope:zope. (Closes: #453180)
   * autoscripts/postinst-dzinstance: break if something went wrong while
     creating the instance.
-  * dh_installzopeinstance: fixed a bug, the default user for the instance
-    should be zope:zope. (Closes: #453180)
+  * dh_installzope: add a Package field in the multiple dzproduct files mode.
+  * dh_installzope: smartly handle ZopeVersions in a multiple dzproduct files
+    mode.
 
- -- Fabio Tranchitella <kobold at debian.org>  Thu, 29 Nov 2007 14:02:30 +0100
+ -- Fabio Tranchitella <kobold at debian.org>  Fri, 30 Nov 2007 18:05:39 +0100
 
 zope-debhelper (0.3.10) unstable; urgency=high
 

Modified: zope-debhelper/trunk/dh_installzope
===================================================================
--- zope-debhelper/trunk/dh_installzope	2007-11-30 16:44:42 UTC (rev 1063)
+++ zope-debhelper/trunk/dh_installzope	2007-11-30 17:06:18 UTC (rev 1064)
@@ -304,12 +304,16 @@
         if (! $target) {
             error("no Name or Directory key in debian/$fn")
         }
+        if (not exists $dzproduct{'Package'}) {
+            $dzproduct{'Package'} = $package;
+        }
         if (! -d "$tmp/usr/$archdir/zope/Products/$target") {
             doit("install","-g",0,"-o",0,"-d","$tmp/usr/$archdir/zope/Products/$target");
         }
         doit("install","-g",0,"-o",0,"-m644","-p","debian/$fn",
              "$tmp/usr/$archdir/zope/Products/$target/.dzproduct");
         $dzproduct{'Version'} = $dh{VERSION};
+        $dzproduct{'ZopeVersions'} = addzopesubstvars($package, %dzproduct) if exists $dzproduct{'ZopeVersions'};
         write_dzfile("$tmp/usr/$archdir/zope/Products/$target/.dzproduct", %dzproduct);
         if (! $dh{NOSCRIPTS}) {
             foreach my $script (@autoscripts) {
@@ -320,7 +324,6 @@
                       );
             }
         }
-        addzopesubstvars($package, %dzproduct);
     }
 
     foreach my $fn (@dzex_files) {
@@ -329,12 +332,16 @@
         if (! $target) {
             error("no Extension or Directory key in debian/$fn")
         }
+        if (not exists $dzext{'Package'}) {
+            $dzext{'Package'} = $package;
+        }
         if (! -d "$tmp/usr/$archdir/zope/Extensions/$target") {
             doit("install","-g",0,"-o",0,"-d","$tmp/usr/$archdir/zope/Extensions/$target");
         }
         doit("install","-g",0,"-o",0,"-m644","-p","debian/$fn",
              "$tmp/usr/$archdir/zope/Extensions/$target/.dzextension");
         $dzext{'Version'} = $dh{VERSION};
+        $dzext{'ZopeVersions'} = addzopesubstvars($package, %dzext) if exists $dzext{'ZopeVersions'};
         write_dzfile("$tmp/usr/$archdir/zope/Extensions/$target/.dzextension", %dzext);
         if (! $dh{NOSCRIPTS}) {
             foreach my $script (@autoscripts) {
@@ -345,7 +352,6 @@
                       );
             }
         }
-        addzopesubstvars($package, %dzext);
     }
 }