r27286 - /trunk/dh-make-perl/dh-make-perl

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Wed Nov 26 09:39:54 UTC 2008


Author: dmn
Date: Wed Nov 26 09:39:52 2008
New Revision: 27286

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27286
Log:
substitute_perl_dependency() removed as not used

Having both ${perl:Depends} and a versioned Depends on perl is actually OK,
as we can't really guarantee which one is bigger as ${perl:Depends} is
substituted at package build time

Modified:
    trunk/dh-make-perl/dh-make-perl

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=27286&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Wed Nov 26 09:39:52 2008
@@ -1205,34 +1205,6 @@
         return $1 if $desc =~ /^#(\d+): ITP: $package /;
     }
     return 0;
-}
-
-sub substitute_perl_dependency {
-
-    # If we get 'perl' specified in here, the module requires a
-    # specific version of Perl in order to be run. This is only
-    # reliable if we have ${perl:Depends} in $depends and either
-    # of $bdepends and $bdependsi - Warn otherwise.
-    my ( $version, $dep_str, $old_dep_str, $old_bdep_str );
-    $version = shift;
-
-    # Over-escaping? I'm putting this in variables to get a bit more clarity.
-    # Remember they will be fed into the regex engine.
-    $dep_str      = "perl (>= $version)";
-    $old_dep_str  = '\\$\\{perl:Depends\\}';
-    $old_bdep_str = "perl \\(>= $min_perl_version\\)";
-
-    unless (
-        $depends =~ s/$old_dep_str/$dep_str/
-        and (  $bdepends =~ s/$old_bdep_str/$dep_str/
-            or $bdependsi =~ s/$old_bdep_str/$dep_str/ )
-        )
-    {
-        warn "The module requires Perl version $version, but you have ",
-            "apparently overriden the default dependency handling.\n",
-            "Please note that you might need to manually edit your debian/control ",
-            "- It might not make sense at all!\n";
-    }
 }
 
 sub check_for_xs {




More information about the Pkg-perl-cvs-commits mailing list