r543: * Patch from Andrew Suffield to make dh_perl understand #!/usr/bin/env perl

[debhelper.git] / dh_perl

diff --git a/dh_perl b/dh_perl
index 4292029c9922ca001e9fcc7f06d431daed2558f2..e9a001d9698e91534fda4566d362418bba20037b 100755 (executable)
--- a/dh_perl
+++ b/dh_perl
@@ -13,12 +13,12 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-  dh_perl [debhelper options] [-d] [library dirs ...]
+B<dh_perl> [S<I<debhelper options>>] [B<-d>] [S<I<library dirs ...>>]
 
 =head1 DESCRIPTION
 
 dh_perl is a debhelper program that is responsible for generating
-the perl:Depends substitutions and adding them to substvars files.
+the ${perl:Depends} substitutions and adding them to substvars files.
 
 The program will look at perl scripts and modules in your package,
 and will use this information to generate a dependency.
@@ -88,13 +88,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp = tmpdir($package);
        my $ext = pkgext($package);
 
-       # For idempotency, remove anything this program might have
-       # previously added to the substvars file.
-       if (-e "debian/${ext}substvars") {
-               complex_doit("grep -v ^perl:Depends= debian/${ext}substvars > debian/${ext}substvars.new || true");
-               doit("mv", "debian/${ext}substvars.new","debian/${ext}substvars");
-       }
-
+       delsubstvar($package, "perl:Depends"); # for idempotency
+       
        # Check also for alternate locations given on the command line
        my @dirs = grep -d, map "$tmp/$_", $vendorlib, $vendorarch, @ARGV;
 
@@ -111,32 +106,31 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                return unless -f and (-x or /\.pl$/);
                local *F;
                return unless open F, $_;
-               if (read F, local $_, 32 and m%^#!\s*/usr/bin/perl\s%) {
+               if (read F, local $_, 32 and m%^#!\s*(/usr/bin/perl|/usr/bin/env\s+perl)\s%) {
                        $deps |= PROGRAM;
                }
                close F;
        }, $tmp;
 
        if ($deps) {
-               my $perl_depends = $perl;
+               my $version="";
                if ($deps & XS_MODULE or $dh{V_FLAG_SET}) {
                        ($version) = `dpkg -s $perl` =~ /^Version:\s*(\S+)/m
                                unless $version;
-                       $perl_depends .= " (>= $version)";
+                       $version = ">= $version";
                }
                elsif ($deps & PM_MODULE) {
-                       $perl_depends .= " (>= $min_version)";
+                       $version = ">= $min_version";
                }
+               
+               # no need to depend on an un-versioned perl-base -- it's
+               # essential
+               addsubstvar($package, "perl:Depends", $perl, $version)
+                       unless $perl eq 'perl-base' && ! length($version);
 
                # add perlapi-<ver> for XS modules
-               $perl_depends .= ", perlapi-$Config{version}"
+               addsubstvar($package, "perl:Depends", "perlapi-$Config{version}")
                        if $deps & XS_MODULE;
-
-               # don't need to depend on an un-versioned perl-base, it's
-               # essential
-               unless ($perl_depends eq 'perl-base') {
-                       complex_doit("echo 'perl:Depends=$perl_depends' >> debian/${ext}substvars");
-               }
        }
 }