r1779: releasing version 4.9.6

diff --git a/debian/changelog b/debian/changelog
index bb394f4c7ddcf29c891c68ae0ecbb1f4950788b1..28d5e796630abda7baf0dc8a5a9c4d5f94da7c21 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (4.9.6) unstable; urgency=low
+
+  * dh_installdocs: Install symlinks to in -x mode, same as in non exclude
+    mode. Closes: #324161
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 24 Aug 2005 16:20:02 -0400
+
 debhelper (4.9.5) unstable; urgency=low
 
   * dh_install: in v5 mode, error out if there are wildcards in the file

diff --git a/dh_installdocs b/dh_installdocs
index 52d1675fb7ff787c17603ef38b0953a7099005cd..9c12d49d0199b78146b9ba4b31f1582ee81a16b8 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -133,7 +133,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                            # 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");