r513: * Fixed dh_installdocs and dh_installexamples to support multiple -X's.

diff --git a/debian/changelog b/debian/changelog
index 663f3e357824001d27fac16b6629ce772da21ad8..1f7903b6a6230939abc5aee9cd0214c959da64f4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (3.4.11) unstable; urgency=low
+
+  * Fixed dh_installdocs and dh_installexamples to support multiple -X's.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 28 Feb 2002 13:02:35 -0500
+
 debhelper (3.4.10) unstable; urgency=low
 
   * Fixed dh_movefiles. Closes: #135479, #135459

diff --git a/dh_installdocs b/dh_installdocs
index 9b5922f84148666a9ad2f3d16e5e325eb18cac68..7bfe8ff167803eca067f66a3b7c01ddbd53de797 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -115,7 +115,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        if (@docs) {
                my $exclude = '';
                if ($dh{EXCLUDE_FIND}) {
-                       $exclude = ' \( ! '.$dh{EXCLUDE_FIND}.' \)';
+                       $exclude = ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';
                }
                foreach my $doc (@docs) {
                        next if excludefile($doc);

diff --git a/dh_installexamples b/dh_installexamples
index f53dbc979a2e84a6b12c313e81e7d6a4779d136d..26517e711b8d2adcbb3375de63b94b7504fe5239 100755 (executable)
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -78,7 +78,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                
                my $exclude = '';
                if ($dh{EXCLUDE_FIND}) {
-                       $exclude = ' \( ! '.$dh{EXCLUDE_FIND}.' \)';
+                       $exclude = ' -and ! \( '.$dh{EXCLUDE_FIND}.' \)';
                }
                
                foreach my $example (@examples) {