[dh-make-perl] 01/02: avoid depending on perl(-(base|modules))? for dual-lifed modules

[Damyan Ivanov]

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

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

commit f1f7ff9937463ef5c95319cfed98e90e8c827d83
Author: Damyan Ivanov <dmn at debian.org>
Date:   Sat Oct 19 21:32:46 2013 +0000

    avoid depending on perl(-(base|modules))? for dual-lifed modules
    
    these are handled by other means
---
 lib/Debian/AptContents.pm      |    7 +++++++
 lib/Debian/Control/FromCPAN.pm |    6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/Debian/AptContents.pm b/lib/Debian/AptContents.pm
index 71ca91d..e47af51 100644
--- a/lib/Debian/AptContents.pm
+++ b/lib/Debian/AptContents.pm
@@ -406,6 +406,13 @@ sub find_file_packages {
                                                # otherwise it won't strip enough off Ubuntu's
                                                # usr/share/perl5/Config/Any.pm  universe/perl/libconfig-any-perl
 
+    # in-core dependencies are given by find_core_perl_dependency
+    @packages = grep {
+        ( $_         ne 'perl-base' )
+            and ( $_ ne 'perl' )
+            and ( $_ ne 'perl-modules' )
+    } @packages;
+
     return uniq @packages;
 }
 
diff --git a/lib/Debian/Control/FromCPAN.pm b/lib/Debian/Control/FromCPAN.pm
index ca7d542..787575f 100644
--- a/lib/Debian/Control/FromCPAN.pm
+++ b/lib/Debian/Control/FromCPAN.pm
@@ -328,7 +328,11 @@ sub find_debs_for_modules {
                 my $alt_dep;
 
                 if ( my @pkgs = Debian::DpkgLists->scan_perl_mod($module) ) {
-                    @pkgs = grep { $_ ne 'perl-modules' } @pkgs;
+                    @pkgs = grep {
+                                ( $_ ne 'perl-modules' )
+                            and ( $_ ne 'perl-base' )
+                            and ( $_ ne 'perl' )
+                    } @pkgs;
 
                     $alt_dep = Debian::Dependency->new(
                           ( @pkgs > 1 )

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