r36338 - in /trunk/dh-make-perl: TODO lib/DhMakePerl.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sun May 24 20:09:38 2009
New Revision: 36338

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=36338
Log:
--refresh: always use versioned dependencies on perl(-(base,modules))?

as mandated by Perl policy

Modified:
    trunk/dh-make-perl/TODO
    trunk/dh-make-perl/lib/DhMakePerl.pm

Modified: trunk/dh-make-perl/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/TODO?rev=36338&op=diff
==============================================================================
--- trunk/dh-make-perl/TODO (original)
+++ trunk/dh-make-perl/TODO Sun May 24 20:09:38 2009
@@ -1,5 +1,3 @@
-* --refresh on libnet-imap-client-perl drops "perl" from B-D-I
-
 * --refresh: add --[no-]backups option (on by default)
   used for controlling creation of backup files of things that are rewritten
 

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=36338&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Sun May 24 20:09:38 2009
@@ -209,27 +209,26 @@
         }
 
         # remove build-depending/conflicting on ancient perl versions
-        for ( qw( perl perl-modules ) ) {
-            $control->source->Build_Depends->remove(
-                "$_ (>= $oldest_perl_version)"
-            );
-            $control->source->Build_Depends_Indep->remove(
-                "$_ (>= $oldest_perl_version)"
-            );
+        for my $pkg ( qw( perl perl-base perl-modules ) ) {
+            for ( qw( Build_Depends Build_Depends_Indep ) ) {
+                $control->source->$_->add("$pkg (>= $min_perl_version)")
+                    if $control->source->$_->has($pkg);
+            }
             $control->source->Build_Conflicts->remove(
-                "$_ (<< $oldest_perl_version)"
+                "$pkg (<< $oldest_perl_version)"
             );
             $control->source->Build_Conflicts_Indep->remove(
-                "$_ (<< $oldest_perl_version)"
+                "$pkg (<< $oldest_perl_version)"
             );
         }
 
         # remove depending/conflicting on ancient perl versions
-        for my $perl ( qw( perl perl-modules ) ) {
+        for my $perl ( qw( perl perl-base perl-modules ) ) {
             for my $pkg ( $control->binary->Values ) {
-                $pkg->Depends->remove("$perl (>= $oldest_perl_version)");
-                $pkg->Recommends->remove("$perl (>= $oldest_perl_version)");
-                $pkg->Suggests->remove("$perl (>= $oldest_perl_version)");
+                for my $dep ( qw(Depends Recommends Suggests) ) {
+                    $pkg->$dep->add("$perl (>= $min_perl_version)")
+                        if $pkg->$dep->has($perl);
+                }
                 $pkg->Conflicts->remove("$perl (<< $oldest_perl_version)");
             }
         }