[dh-make-perl] 01/02: Extend checks for 'perl-modules'.

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository dh-make-perl.

commit 05115edcdda210336adc9c72bcf4645b00a103f4
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Oct 23 01:02:11 2016 +0200

    Extend checks for 'perl-modules'.
    
    perl-modules has been replaced by perl-modules-5.2[24]. Adapt checks for it.
    
    NOTE: I'm not sure this is used anywhere in practice; test still pass, and a
    manual test run doesn't change anything.
    (The problem which triggered this change was actually #841737 in
    libmodule-corelist-perl.)
---
 lib/Debian/AptContents.pm      |  4 ++--
 lib/Debian/Control/FromCPAN.pm | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Debian/AptContents.pm b/lib/Debian/AptContents.pm
index 1b1a7d6..6913363 100644
--- a/lib/Debian/AptContents.pm
+++ b/lib/Debian/AptContents.pm
@@ -318,7 +318,7 @@ sub find_file_packages {
     @packages = grep {
         ( $_         ne 'perl-base' )
             and ( $_ ne 'perl' )
-            and ( $_ ne 'perl-modules' )
+            and ( $_ !~ /^perl-modules(?:-[\d.]+)?/ )
     } @packages;
 
     return uniq @packages;
@@ -359,7 +359,7 @@ sub find_perl_module_package {
     } @matches;
 
     # we don't want perl, perl-base and perl-modules here
-    @matches = grep { !/^perl(?:-(?:base|modules))?$/ } @matches;
+    @matches = grep { !/^perl(?:-(?:base|modules(?:-[\d.]+)?))?$/ } @matches;
 
     my $direct_dep;
     $direct_dep = Debian::Dependency->new(
diff --git a/lib/Debian/Control/FromCPAN.pm b/lib/Debian/Control/FromCPAN.pm
index d77a3ae..51893be 100644
--- a/lib/Debian/Control/FromCPAN.pm
+++ b/lib/Debian/Control/FromCPAN.pm
@@ -404,7 +404,7 @@ sub find_debs_for_modules {
 
                 if ( my @pkgs = Debian::DpkgLists->scan_perl_mod($module) ) {
                     @pkgs = grep {
-                                ( $_ ne 'perl-modules' )
+                                ( $_ !~ /^perl-modules(?:-[\d.]+)?$/ )
                             and ( $_ ne 'perl-base' )
                             and ( $_ ne 'perl' )
                     } @pkgs;
@@ -477,7 +477,7 @@ The following checks are made
 
 =over
 
-=item dependencies on C<perl-modules>
+=item dependencies on C<perl-modules*>
 
 These are replaced with C<perl> as per Perl policy.
 
@@ -499,7 +499,7 @@ if the dependency is redundant.
 
 =item pruned dependency
 
-otherwise. C<perl-modules> replaced with C<perl>.
+otherwise. C<perl-modules*> replaced with C<perl>.
 
 =back
 
@@ -511,10 +511,10 @@ sub prune_simple_perl_dep {
     croak "No alternative dependencies can be given"
         if $dep->alternatives;
 
-    return $dep unless $dep->pkg =~ /^(?:perl|perl-base|perl-modules)$/;
+    return $dep unless $dep->pkg =~ /^(?:perl|perl-base|perl-modules(?:-[\d.]+)?)$/;
 
     # perl-modules is replaced with perl
-    $dep->pkg('perl') if $dep->pkg eq 'perl-modules';
+    $dep->pkg('perl') if $dep->pkg =~ /^perl-modules(?:-[\d.]+)?$/;
 
     my $unversioned = (
         not $dep->ver

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/dh-make-perl.git