dh_installchangelogs: When searching for changelog in v7 mode, skip empty files....

diff --git a/debian/changelog b/debian/changelog
index 8a77d628ed2e2da69bd15b3b4d7945e53e30bd59..4e6ed7c0ad5a8d9f936a87c6d811d16742d2d22e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 debhelper (7.0.16) UNRELEASED; urgency=low
 
   * dh: Avoid passing --with on to subcommands. Closes: #490886
+  * dh_installchangelogs: When searching for changelog in v7 mode, skip
+    empty files. Closes: #490937
 
  -- Joey Hess <joeyh@debian.org>  Mon, 14 Jul 2008 20:35:47 -0400
 

diff --git a/dh_installchangelogs b/dh_installchangelogs
index fc0b91d7384b180e1a6ed2f6903fd70beeb3d048..7042c5f9b742d270e7b13f67b123aaf84c1e4bb0 100755 (executable)
--- a/dh_installchangelogs
+++ b/dh_installchangelogs
@@ -69,7 +69,7 @@ if (! defined $upstream) {
        if (! isnative($dh{MAINPACKAGE}) && !compat(6)) {
                my @files=sort glob("*");
                foreach my $name (qw{changelog changes}) {
-                       my @matches=grep { lc $_ eq $name } @files;
+                       my @matches=grep { lc $_ eq $name && -s $_ } @files;
                        if (@matches) {
                                $upstream=shift @matches;
                                last;