r1779: releasing version 4.9.6

[debhelper.git] / dh_installdocs

diff --git a/dh_installdocs b/dh_installdocs
index b694d7c0b75a88d4a2449614ca41d28e34ea2ae4..9c12d49d0199b78146b9ba4b31f1582ee81a16b8 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -20,7 +20,7 @@ documentation into usr/share/doc/package in package build directories.
 
 dh_installdocs automatically installs debian/copyright if it exists. If
 dh_installdocs is acting on multiple packages, debian/copyright files will be
-installed into all packages. However, if you need to have seperate copyright
+installed into all packages. However, if you need to have separate copyright
 files for different binary packages, you can use files named
 debian/package.copyright.
 
@@ -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");