summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_perl2
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 869226f..e60996b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.4.3) UNRELEASED; urgency=low
+
+ * dh_perl: Do not look at perl scripts under /usr/share/doc.
+ Closes: #546683
+
+ -- Joey Hess <joeyh@debian.org> Tue, 15 Sep 2009 13:18:35 -0400
+
debhelper (7.4.2) unstable; urgency=low
* Man page typo. Closes: #545443
diff --git a/dh_perl b/dh_perl
index 56d9f21..eaa08fa 100755
--- a/dh_perl
+++ b/dh_perl
@@ -106,6 +106,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%) {