summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rwxr-xr-xdh_installdocs2
-rwxr-xr-xdh_installexamples2
3 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 663f3e3..1f7903b 100644
--- 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 9b5922f..7bfe8ff 100755
--- 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 f53dbc9..26517e7 100755
--- 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) {