Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

diff --git a/debian/changelog b/debian/changelog
index 869226f406e57a25982d70b0084a2912aac03d26..e60996b463f6f7ff68ca73b1b54385b059bb28f7 100644 (file)
--- 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 56d9f21a972d3c73d7912ee53bd396ee6da128bc..eaa08fa8e8a4ab21e06cee785590b1cfc892c7ba 100755 (executable)
--- 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%) {