X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_perl;h=bf2506c5bcd1eb6ea56c04607015e93301c729fc;hb=e2a6d4cec4a7ee952cf6a7f250d80f1d75a38f95;hp=facad8d60b7d5c559cc6b427fea6842189349fe4;hpb=088be5d001d899c42b9d572e91198791748e5b46;p=debhelper.git diff --git a/dh_perl b/dh_perl index facad8d..bf2506c 100755 --- 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 @@ -13,17 +13,20 @@ use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS -B [S>] [B<-d>] [S>] +B [S>] [B<-d>] [S ...>] =head1 DESCRIPTION -dh_perl is a debhelper program that is responsible for generating -the perl:Depends substitutions and adding them to substvars files. +B is a debhelper program that is responsible for generating +the B<${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}". +The program will look at Perl scripts and modules in your package, +and will use this information to generate a dependency on B or +B. The dependency will be substituted into your package's F +file wherever you place the token B<${perl:Depends}>. + +B also cleans up empty directories that MakeMaker can generate when +installing Perl modules. =head1 OPTIONS @@ -31,31 +34,35 @@ wherever you place the token "${perl:Depends}". =item B<-d> -In some specific cases you may want to depend on perl-base rather than the -full perl package. If so, you can pass the -d option to make dh_perl generate +In some specific cases you may want to depend on B rather than the +full B package. If so, you can pass the -d option to make B 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 B to be generated at +all. B 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 -on any specific version of perl. The -V option causes the current -version of the perl (or perl-base with -d) package to be specified. +on any specific version of B. The B<-V> option causes the current +version of the B (or B with B<-d>) package to be specified. =item I -If your package installs perl modules in non-standard -directories, you can make dh_perl check those directories by passing their -names on the command line. It will only check the vendorlib and vendorarch +If your package installs Perl modules in non-standard +directories, you can make B check those directories by passing their +names on the command line. It will only check the F and F directories by default. =back =head1 CONFORMS TO -Debian policy, version 3.0.1 +Debian policy, version 3.8.3 -Perl policy, version 1.18 +Perl policy, version 1.20 =cut @@ -64,10 +71,6 @@ init(); my $vendorlib = substr $Config{vendorlib}, 1; my $vendorarch = substr $Config{vendorarch}, 1; -# the installation dir for arch-indep modules changed to -# /usr/share/perl5 in this version: -my $min_version = '5.6.0-16'; - # Cleaning the paths given on the command line foreach (@ARGV) { s#/$##; @@ -85,15 +88,7 @@ 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); # Check also for alternate locations given on the command line my @dirs = grep -d, map "$tmp/$_", $vendorlib, $vendorarch, @ARGV; @@ -109,40 +104,48 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # find scripts find sub { return unless -f and (-x or /\.pl$/); + return if $File::Find::dir=~/\/usr\/share\/doc\//; + 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)"; - } - elsif ($deps & PM_MODULE) { - $perl_depends .= " (>= $min_version)"; + $version = ">= $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- for XS modules - $perl_depends .= ", perlapi-$Config{version}" + addsubstvar($package, "perl:Depends", + "perlapi-" . ($Config{debian_abi} || $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 +L This program is a part of debhelper.