r504 - in zope-debhelper/trunk: . debian

[Fabio Tranchitella]

Author: kobold
Date: 2006-11-18 14:15:58 +0100 (Sat, 18 Nov 2006)
New Revision: 504

Modified:
   zope-debhelper/trunk/debian/changelog
   zope-debhelper/trunk/dh_installzope
Log:
Changes.


Modified: zope-debhelper/trunk/debian/changelog
===================================================================
--- zope-debhelper/trunk/debian/changelog	2006-11-18 12:00:29 UTC (rev 503)
+++ zope-debhelper/trunk/debian/changelog	2006-11-18 13:15:58 UTC (rev 504)
@@ -1,3 +1,9 @@
+zope-debhelper (0.3.4) unstable; urgency=low
+
+  * Fixed rewriting of ZopeVersions field when used with a >= operator.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Sat, 18 Nov 2006 14:15:25 +0100
+
 zope-debhelper (0.3.3) unstable; urgency=medium
 
   * dh_installzope:

Modified: zope-debhelper/trunk/dh_installzope
===================================================================
--- zope-debhelper/trunk/dh_installzope	2006-11-18 12:00:29 UTC (rev 503)
+++ zope-debhelper/trunk/dh_installzope	2006-11-18 13:15:58 UTC (rev 504)
@@ -154,6 +154,7 @@
     }
     $var = substr($var, 0, length($var)-3);
     addsubstvar($package, "zope:Depends", $var);
+    return join(" ", reverse(@versions));
 }
 
 my @autoscripts = ('preinst', 'postinst', 'prerm', 'postrm');
@@ -227,8 +228,7 @@
             $tdzproduct{'Package'} = $package;
         }
         $tdzproduct{'Version'} = $dh{VERSION};
-        # read dzpackage file ... if it exists, get the target dir from it.
-        # if it doesn't exist, generate one
+        $tdzproduct{'ZopeVersions'} = addzopesubstvars($package, %tdzproduct);
 
         my $exclude = '';
         if ($dh{EXCLUDE_FIND}) {
@@ -296,7 +296,6 @@
         doit("chown","-R","0:0","$tmp/usr/$archdir/zope/Products");
         doit("chmod","-R","go=rX","$tmp/usr/$archdir/zope/Products");
         doit("chmod","-R","u+rw","$tmp/usr/$archdir/zope/Products");
-        addzopesubstvars($package, %tdzproduct);
     }
 
     foreach my $fn (@dzpr_files) {