releasing version 6.0.2

diff --git a/debian/changelog b/debian/changelog
index 9cb96ecd43ae16bf7d9ba65850ba84d4f00c88e7..fbcea8c707adc7d5ce86faa9b159f97876de729b 100644 (file)
--- 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 3707a1366830263862c66293b4cc02bbae4685dd..35672369f319c8c6c37d8fe45351e5187f57ca2c 100755 (executable)
--- 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 1e10e65b3af915d96a83db4886b871438ebf7924..3e5e0893faac5e17d390661a6363ecaf10e42232 100755 (executable)
--- 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");