r1859: * Reverted change in 4.1.9, so generation of EXCLUDE_FIND escapes "." to

  "\\.", which turns into "\." after being run through the shell, and
  prevents find from treating -X.svn as a regexp that matches files such
  as foo/svn.vim. (It's safe to do this now that all uses of EXCLUDE_FIND are
  via complex_doit(), which was not the case of dh_clean when this change
  was originally made.) Closes: #349070

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 7c0a18a4130b64153bc26631c8c70cabadc97061..80645abe3f8f8b42a99974bb7fa394f7bb2af8f7 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -55,7 +55,7 @@ sub init {
                foreach (@{$dh{EXCLUDE}}) {
                        my $x=$_;
                        $x=escape_shell($x);
-                       $x=~s/\./\\./g;
+                       $x=~s/\./\\\\./g;
                        $dh{EXCLUDE_FIND}.="-regex .\\*$x.\\* -or ";
                }
                $dh{EXCLUDE_FIND}=~s/ -or $//;

diff --git a/debian/changelog b/debian/changelog
index e0318f78929cc63af3cbd2fe7ff9a80cf6a2bc2f..f969c30a5f2b9ff1a2fbfcf820ddea4064092922 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 debhelper (5.0.18) UNRELEASED; urgency=low
 
   * Improved po4a cleaning. Closes: #348521
-
- -- Joey Hess <joeyh@debian.org>  Wed, 18 Jan 2006 16:12:13 -0500
+  * Reverted change in 4.1.9, so generation of EXCLUDE_FIND escapes "." to
+    "\\.", which turns into "\." after being run through the shell, and
+    prevents find from treating -X.svn as a regexp that matches files such
+    as foo/svn.vim. (It's safe to do this now that all uses of EXCLUDE_FIND are
+    via complex_doit(), which was not the case of dh_clean when this change
+    was originally made.) Closes: #349070
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 20 Jan 2006 16:56:00 -0500
 
 debhelper (5.0.17) unstable; urgency=low
 

diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING
index b87a8c6002eb5576bb386090af1872d4063ee7e7..a33daeb065e32d67279599cdc9411731798d4d54 100644 (file)
--- a/doc/PROGRAMMING
+++ b/doc/PROGRAMMING
@@ -102,7 +102,9 @@ switch              variable        description
                 EXCLUDE_FIND   same as DH_EXCLUDE, except all items are put
                                into a string in a way that they will make
                                find find them. (Use ! in front to negate
-                               that, of course)
+                               that, of course) Note that this should
+                               only be used inside complex_doit(), not in
+                               doit().
 -x             INCLUDE_CONFFILES
                                include conffiles. It's -x for obscure
                                historical reasons.