r1779: releasing version 4.9.6

[debhelper.git] / dh_installdocs

diff --git a/dh_installdocs b/dh_installdocs
index f1c6619798c9ff494ca005d3b69ea459d0fdd2a0..9c12d49d0199b78146b9ba4b31f1582ee81a16b8 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -127,12 +127,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
                foreach my $doc (@docs) {
                        next if excludefile($doc);
+                       next if ! -s $doc && ! compat(4); # ignore empty BUGS, etc
                        if (-d $doc && $exclude) {
                            my ($dir_basename) = basename($doc);
                            # Pity there's no cp --exclude ..
                            my $pwd=`pwd`;
                            chomp $pwd;
-                           complex_doit("cd $doc/.. && find $dir_basename -type f$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package \\;");
+                           complex_doit("cd $doc/.. && find $dir_basename \\( -type f or -type l \\)$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package \\;");
                        }
                        else {
                                doit("cp","-a",$doc,"$tmp/usr/share/doc/$package");