From: Joey Hess <joey@kodama.kitenet.net>
Date: Sat, 12 Jan 2008 17:32:49 +0000 (-0500)
Subject: releasing version 6.0.2
X-Git-Tag: 6.0.2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9e4db53580d18470f2411b0e3fabd67666aba93c;p=debhelper.git

releasing version 6.0.2
---

diff --git a/debian/changelog b/debian/changelog
index 9cb96ec..fbcea8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (6.0.2) unstable; urgency=low
+
+  * Revert slightly broken refactoring of some exclude code.
+    Closes: #460340, #460351
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 12 Jan 2008 12:31:15 -0500
+
 debhelper (6.0.1) unstable; urgency=low
 
   * dh_installdocs/examples: Don't unnecessarily use the exclude code path.
diff --git a/dh_installdocs b/dh_installdocs
index 3707a13..3567236 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -137,8 +137,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				my $dir = ($basename eq '.') ? $doc : "$doc/..";
 				my $pwd=`pwd`;
 				chomp $pwd;
-				$exclude='\\( -type f -or -type l \\)'.$exclude;
-				complex_doit("cd '$dir' && find '$basename' $exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package \\;");
+				complex_doit("cd '$dir' && find '$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");
diff --git a/dh_installexamples b/dh_installexamples
index 1e10e65..3e5e089 100755
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -90,8 +90,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				my $dir = ($basename eq '.') ? $example : "$example/..";
 				my $pwd=`pwd`;
 				chomp $pwd;
-				$exclude = '-type f'.$exclude;
-				complex_doit("cd '$dir' && find '$basename' $exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;");
+				my $exclude2 = '-type f'.$exclude;
+				complex_doit("cd '$dir' && find '$basename' -type f$exclude -exec cp --parents -dp {} $pwd/$tmp/usr/share/doc/$package/examples \\;");
 			}
 			else {
 				doit("cp", "-a", $example, "$tmp/usr/share/doc/$package/examples");