[debhelper-devel] [debhelper] 01/01: dh_u_a_c: Exclude all hidden directories in pkg root

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit ce76ccc473cc89c7659e0d19778e823810d2da49
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Jan 15 20:10:26 2016 +0000

    dh_u_a_c: Exclude all hidden directories in pkg root
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog           | 8 ++++++++
 dh_update_autotools_config | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7046fa6..13e1d7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (9.20160114+unreleased) UNRELEASED; urgency=medium
+
+  * Fix brown paper bag bug that caused many packages to
+    FTBFS when dh_update_autotools_config was called.
+    (Closes: #811052)
+
+ -- Niels Thykier <niels at thykier.net>  Fri, 15 Jan 2016 20:01:36 +0000
+
 debhelper (9.20160114) unstable; urgency=low
 
   [ Niels Thykier ]
diff --git a/dh_update_autotools_config b/dh_update_autotools_config
index 5501066..e26073a 100755
--- a/dh_update_autotools_config
+++ b/dh_update_autotools_config
@@ -27,7 +27,9 @@ init();
 
 for my $basename (qw(config.guess config.sub)) {
 	my $new_version = "/usr/share/misc/$basename";
-	open(my $fd, '-|', 'find', '-type', 'f', '-name', $basename)
+	open(my $fd, '-|', 'find', '-mindepth', '1',
+		 '(', '-type', 'd', '-name', '.*', '-prune', ')',
+		 '-o', '-type', 'f', '-name', $basename, '-print')
 		or error("Cannot run find -type f -name $basename: $!");
 	while (my $filename = <$fd>) {
 		chomp($filename);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git