X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_perl;h=eaa08fa8e8a4ab21e06cee785590b1cfc892c7ba;hb=0ddabafbcd0baf833394d50b48b3dae7d23fe52b;hp=64cb362bc8bc755092c6145ec2bf3cdce3d7201b;hpb=e8dfff67a6db95dda5951585f74ce2e89f1ac1cf;p=debhelper.git

diff --git a/dh_perl b/dh_perl
index 64cb362..eaa08fa 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
 
-  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.
-The dependancy 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,16 @@ 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
+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.
+
 =item I<library dirs>
 
 If your package installs perl modules in non-standard
@@ -47,9 +60,9 @@ directories by default.
 
 =head1 CONFORMS TO
 
-Debian policy, version 3.0.1
+Debian policy, version 3.8.3
 
-Perl policy, version 1.15
+Perl policy, version 1.20
 
 =cut
 
@@ -75,9 +88,10 @@ use constant PM_MODULE => 2;
 use constant XS_MODULE => 4;
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
-	my $tmp = tmpdir($package);
-	my $ext = pkgext($package);
+	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;
 
@@ -87,56 +101,52 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		return unless -f;
 		$deps |= PM_MODULE if /\.pm$/;
 		$deps |= XS_MODULE if /\.so$/;
-	    }, @dirs if @dirs;
+	}, @dirs if @dirs;
 
 	# 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%)
-		{
-		    $deps |= PROGRAM;
+		if (read F, local $_, 32 and m%^#!\s*(/usr/bin/perl|/usr/bin/env\s+perl)\s%) {
+			$deps |= PROGRAM;
 		}
-
 		close F;
-	    }, $tmp;
-
-	next unless $deps;
-
-	my $perl_depends = $perl;
-	if ($deps & XS_MODULE or $dh{V_FLAG_SET})
-	{
-	    ($version) = `dpkg -p $perl` =~ /^Version:\s*(\S+)/m
-		unless $version;
-
-	    $perl_depends .= " (>= $version)";
+	}, $tmp;
+
+	if ($deps) {
+		my $version="";
+		if ($deps & XS_MODULE or $dh{V_FLAG_SET}) {
+			($version) = `dpkg -s $perl` =~ /^Version:\s*(\S+)/m
+				unless $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-<ver> for XS modules
+		addsubstvar($package, "perl:Depends", "perlapi-$Config{version}")
+			if $deps & XS_MODULE;
 	}
 
-	# add perlapi-<ver> for XS modules
-	$perl_depends .= ", perlapi-$Config{version}"
-	    if $deps & XS_MODULE;
-
-	# don't need to depend on an un-versioned perl-base, it's
-	# essential
-	next if $perl_depends eq 'perl-base';
-
-	if (-e "debian/${ext}substvars") {
-		open (IN, "<debian/${ext}substvars");
-		my @lines=grep { ! /^perl:Depends=/ } <IN>;
-		close IN;
-		open (OUT, ">debian/${ext}substvars");
-		print OUT @lines;
-	} else {
-		open (OUT, ">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");
+		}
 	}
-	print OUT "perl:Depends=$perl_depends\n";
-	close OUT;
 }
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.