Fix typo in French translation, about debian/package.README.Debian files.

[debhelper.git] / dh_perl

diff --git a/dh_perl b/dh_perl
index facad8d60b7d5c559cc6b427fea6842189349fe4..fbeee2d9525faf29c0ac9c9688906161f3c571f1 100755 (executable)
--- a/dh_perl
+++ b/dh_perl
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_perl - calculates perl scripts & modules dependencies
+dh_perl - calculates perl dependencies and cleans up after MakeMaker
 
 =cut
 
@@ -18,12 +18,15 @@ 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.
-The dependency will be substituted into your package's control file
-wherever you place the token "${perl:Depends}".
+and will use this information to generate a dependency on perl or
+perlapi. The dependency will be substituted into your package's control
+file wherever you place the token "${perl:Depends}".
+
+dh_perl also cleans up empty directories that MakeMaker can generate when
+installing perl modules.
 
 =head1 OPTIONS
 
@@ -36,6 +39,10 @@ full perl package. If so, you can pass the -d option to make dh_perl generate
 a dependency on the correct base package. This is only necessary for some
 packages that are included in the base system.
 
+Note that this flag may cause no dependency on perl-base to be generated at
+all. perl-base is Essential, so its dependency can be left out, unless a
+versioned dependency is needed.
+
 =item B<-V>
 
 By default, scripts and architecture independent modules don't depend
@@ -85,16 +92,10 @@ use constant PM_MODULE => 2;
 use constant XS_MODULE => 4;
 
 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");
-       }
+       my $tmp=tmpdir($package);
 
+       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,38 +112,46 @@ 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");
+       # MakeMaker always makes lib and share dirs, but typically
+       # only one directory is installed into.
+       foreach my $dir ("$tmp/usr/share/perl5", "$tmp/usr/lib/perl5") {
+               if (-d $dir) {
+                       doit("rmdir", "--ignore-fail-on-non-empty", "--parents",
+                               "$dir");
                }
        }
 }
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.