From: joey <joey>
Date: Tue, 7 Nov 2000 23:56:05 +0000 (+0000)
Subject: r384: ugh
X-Git-Tag: version_2.0.101~215
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5615612cd688bb01f13b9ea966b4c8d801f03449;p=debhelper.git

r384: ugh
---

diff --git a/dh_perl b/dh_perl
index 1220e08..a3372d5 100755
--- a/dh_perl
+++ b/dh_perl
@@ -13,7 +13,9 @@ my $lib_dir = 'usr/lib/perl5';
 # it points to, otherwise query perl directly.
 my $version=sprintf("%.3f", $]);
 if (defined $ENV{PERL}) {
-	$version=`$ENV{PERL} -e 'printf "%.3f", \$]'`;
+	# This is pretty gawd-aweful ugly, because we need "5.00[45]"
+	# and "5.[6789]" to be returned.
+	$version=`$ENV{PERL} -e '\$] < 5.006 ? printf "%.3f", \$] : printf "%vd\n", substr \$^V, 0, -1'`;
 }
 
 # Cleaning the paths given on the command line
diff --git a/dh_perl.1 b/dh_perl.1
index 9f8bef8..1a8ee3b 100644
--- a/dh_perl.1
+++ b/dh_perl.1
@@ -10,9 +10,9 @@ the perl:Depends substitutions and adding them to substvars files.
 .P
 The program will look for the location of installed modules and will
 use this information to generate a dependency (at the present time
-it can only be perl5, perl5-thread, perl-5.00X or perl-5.00X-thread).
-The dependancy will be substituted into your package's control file wherever
-you place the token "${perl:Depends}".
+it can only be perl5, perl5-thread, perl-5.X or perl-5.X-thread).
+The dependancy will be substituted into your package's control file
+wherever you place the token "${perl:Depends}".
 .P
 It will also look at #! lines of perl scripts in order to be able
 to calculate a dependency for perl scripts and not only perl modules.
@@ -33,14 +33,14 @@ Keep .packlist files.
 .TP
 .B -d
 In some specific cases you may want to depend on a -base package
-(ie perl-5.00X-base or perl5-base). If so, you can pass
+(ie perl-5.6-base or perl5-base). If so, you can pass
 the -d option to make
 .BR dh_perl
 generate a dependency on the correct base package. This is only necessary
 for some modules that are included in the base system.
 .TP
 .B library dirs
-If your package does install perl modules in non-standard
+If your package installs perl modules in non-standard
 directories, you can make
 .BR dh_perl
 check those directories by passing their names on the command line.