r457 - in zope-debhelper/trunk: . debian

[Fabio Tranchitella]

Author: kobold
Date: 2006-11-09 20:25:28 +0100 (Thu, 09 Nov 2006)
New Revision: 457

Modified:
   zope-debhelper/trunk/debian/changelog
   zope-debhelper/trunk/dh_installzope
Log:
Changes for the new upstream release.


Modified: zope-debhelper/trunk/debian/changelog
===================================================================
--- zope-debhelper/trunk/debian/changelog	2006-11-09 18:40:23 UTC (rev 456)
+++ zope-debhelper/trunk/debian/changelog	2006-11-09 19:25:28 UTC (rev 457)
@@ -1,8 +1,13 @@
-zope-debhelper (0.3.2.17) UNRELEASED; urgency=low
+zope-debhelper (0.3.3) unstable; urgency=medium
 
+  * dh_installzope:
+    + Support for zope2.10 by default.
+    + Support for ">= 2.x" ZopeVersions.
+    + Find out the package name if it is not specified by the .dzproduct file.
   * Fix bashism in config-dzinstance.
+  * Set urgency to medium, this upload is targetted etch.
 
- -- Jérémy Bobbio <jeremy.bobbio at etu.upmc.fr>  Sat, 14 Oct 2006 00:11:12 +0200
+ -- Fabio Tranchitella <kobold at debian.org>  Thu,  9 Nov 2006 20:22:47 +0100
 
 zope-debhelper (0.3.2.16) unstable; urgency=low
 

Modified: zope-debhelper/trunk/dh_installzope
===================================================================
--- zope-debhelper/trunk/dh_installzope	2006-11-09 18:40:23 UTC (rev 456)
+++ zope-debhelper/trunk/dh_installzope	2006-11-09 19:25:28 UTC (rev 457)
@@ -76,6 +76,15 @@
 Directory is used to install different product versions. A Directory
 has the form <product name>[:<suffix>].
 
+It is possible to specify the list of zope versions for the 2.x serie
+using a >= relation, like in this example:
+
+  Package: zope-psycopgda
+  ZopeVersions: >= 2.7
+
+This allows bin-NMUs of zope products on new Zope 2.x major versions,
+and for this reason it should be the preferred syntax.
+
 =head1 NOTES
 
 Note that this command is not idempotent. "dh_clean B<-k>" should be called
@@ -86,6 +95,8 @@
 
 init();
 
+my @zope_versions = ('2.6', '2.7', '2.8', '2.9', '2.10', '3');
+
 sub read_dzfile {
     my $fn = shift;
     my %fields=();
@@ -122,20 +133,36 @@
 }
 
 sub addzopesubstvars {
-   my ($package, %fields) = @_;
-   my ($var) = "zope-common (>= 0.5.18), ";
+    my ($package, %fields) = @_;
+    my ($var) = "zope-common (>= 0.5.26), ";
+    my (@versions) = ();
+    my ($minor) = "0";
 
-   if (!$fields{'ZopeVersions'}) {
-       $var .= "zope2.9 | zope2.8 | zope2.7";
-   } else {
-       $fields{'ZopeVersions'} =~ s/,[ \t]+/ /g;
-       my (@vers) = split(/ /, $fields{'ZopeVersions'});
-       foreach (@vers) {
-           $var .= "zope" . $_ . " | ";
-       }
-       $var = substr($var, 0, length($var)-3);
-   }
-   addsubstvar($package, "zope:Depends", $var);
+    if ($fields{'ZopeVersions'}) {
+        my (@vers) = split(/ /, $fields{'ZopeVersions'});
+        if ($vers[0] eq '>=') {
+            @versions = ();
+            if ($vers[1] =~ m/^[0-9]\.([0-9]+)$/) {
+              $minor = $1;
+            } 
+            foreach (@zope_versions) {
+                if ($_ =~ m/[0-9]\.([0-9]+)/ && int($1) >= int($minor)) {
+                    print $_ . "\n";
+                    push(@versions, $_);
+                }
+            }
+        } else {
+            @versions = @vers;
+        }
+    } else {
+      @versions = @zope_versions;
+    }
+
+    foreach (reverse(@versions)) {
+        $var .= "zope" . $_ . " | ";
+    }
+    $var = substr($var, 0, length($var)-3);
+    addsubstvar($package, "zope:Depends", $var);
 }
 
 my @autoscripts = ('preinst', 'postinst', 'prerm', 'postrm');
@@ -201,6 +228,9 @@
         my %tdzproduct;
         if (@dzpr_files) {
             %tdzproduct = read_dzfile(shift @dzpr_files);
+            if (not exists $tdzproduct{'Package'}) {
+                $tdzproduct{'Package'} = $package;
+            }
         }
         else {
             $tdzproduct{'Package'} = $package;