X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_perl;h=bf2506c5bcd1eb6ea56c04607015e93301c729fc;hb=fb8f18f4a98669c3b85e1bd7920fbabfc00b886e;hp=fbeee2d9525faf29c0ac9c9688906161f3c571f1;hpb=e2356719773f7cfb6abe0f49a45486e1f7b0c5e6;p=debhelper.git

diff --git a/dh_perl b/dh_perl
index fbeee2d..bf2506c 100755
--- a/dh_perl
+++ b/dh_perl
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_perl - calculates perl dependencies and cleans up after MakeMaker
+dh_perl - calculates Perl dependencies and cleans up after MakeMaker
 
 =cut
 
@@ -13,20 +13,20 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_perl> [S<I<debhelper options>>] [B<-d>] [S<I<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.
+B<dh_perl> 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 on perl or
-perlapi. 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<perl> or
+B<perlapi>. The dependency will be substituted into your package's F<control>
+file wherever you place the token B<${perl:Depends}>.
 
-dh_perl also cleans up empty directories that MakeMaker can generate when
-installing perl modules.
+B<dh_perl> also cleans up empty directories that MakeMaker can generate when
+installing Perl modules.
 
 =head1 OPTIONS
 
@@ -34,35 +34,35 @@ installing perl modules.
 
 =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<perl-base> rather than the
+full B<perl> package. If so, you can pass the -d option to make B<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
+Note that this flag may cause no dependency on B<perl-base> to be generated at
+all. B<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
-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<perl>. The B<-V> option causes the current
+version of the B<perl> (or B<perl-base> with B<-d>) package to be specified.
 
 =item I<library dirs>
 
-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<dh_perl> check those directories by passing their
+names on the command line. It will only check the F<vendorlib> and F<vendorarch>
 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
 
@@ -71,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#/$##;
@@ -94,8 +90,6 @@ use constant XS_MODULE => 4;
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	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;
 
@@ -110,6 +104,8 @@ 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|/usr/bin/env\s+perl)\s%) {
@@ -125,9 +121,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				unless $version;
 			$version = ">= $version";
 		}
-		elsif ($deps & PM_MODULE) {
-			$version = ">= $min_version";
-		}
 		
 		# no need to depend on an un-versioned perl-base -- it's
 		# essential
@@ -135,7 +128,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			unless $perl eq 'perl-base' && ! length($version);
 
 		# add perlapi-<ver> for XS modules
-		addsubstvar($package, "perl:Depends", "perlapi-$Config{version}")
+		addsubstvar($package, "perl:Depends",
+			"perlapi-" . ($Config{debian_abi} || $Config{version}))
 			if $deps & XS_MODULE;
 	}