r53037 - in /trunk/dh-make-perl: debian/changelog lib/Debian/Control/FromCPAN.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Thu Feb 18 21:25:31 2010
New Revision: 53037

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53037
Log:
FromCPAN::prune_simple_perl_dep: fix inverse logic

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=53037&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Thu Feb 18 21:25:31 2010
@@ -17,6 +17,7 @@
     + uses the lists on http://www.debian.org/devel/wnpp
   * add --source-format option (defaults to "1.0")
   * --refresh: fix pruning of binary package dependencies
+    + also fix pruning of redundant perl(-base) (build-)dependencies
 
   [ gregor herrmann ]
   * DhMakePerl: update_file_list() allows to --refresh --only docs and

Modified: trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm?rev=53037&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm (original)
+++ trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm Thu Feb 18 21:25:31 2010
@@ -251,16 +251,26 @@
 
     return $dep unless $dep->pkg =~ /^(?:perl|perl-base|perl-modules)$/;
 
+    # perl-modules is replaced with perl
     $dep->pkg('perl') if $dep->pkg eq 'perl-modules';
 
+    my $unversioned = not $dep->ver
+        or $dep->rel =~ />/
+        and deb_ver_cmp( $dep->ver, $self->oldstable_perl_version ) <= 0;
+
+    # perl-base is (build-)essential
     return undef
-        if ( $dep->pkg eq 'perl-base'
-                or $build )     # perl is build-essential
-            and (
-            not $dep->ver   # unversioned dependency is redundant
-                or $dep->rel =~ />/
-                and deb_ver_cmp( $dep->ver, $self->oldstable_perl_version ) <= 0
-            );
+        if $dep->pkg eq 'perl-base' and $unversioned;
+
+    # perl is needed in build-dependencies (see Policy 4.2)
+    return $dep if $dep->pkg eq 'perl' and $build;
+
+    # unversioned perl should be replaced with ${perl:Depends} in
+    # non-build-dependencies
+    return '${perl:Depends}'
+        if not $build
+            and $dep->pkg eq 'perl'
+            and $unversioned;
 
     return $dep;
 }