Add .svn, {arch}, and .arch-ids to dpkg-source -i default regex.

diff --git a/ChangeLog b/ChangeLog
index 9c7cc3a6793180e343addb115020e57d0659dfb4..4fa33c7021188f3131f7d5e99ddce29996c87064 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 13 17:18:46 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-source.pl: Add .svn, {arch}, and .arch-ids to dpkg-source
+    -i default regex.
+
 Sat Sep 13 16:34:53 CDT 2003 Adam Heath <doogie@debian.org>
 
   * lib/parse.c: Change use of strncpy in parsedb to memcpy.

diff --git a/debian/changelog b/debian/changelog
index 905973f6f3c58d0694ba634e35730b5c257ff03f..483d891c268686975268610a2118d73be847790f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,10 @@ dpkg (1.10.11) unstable; urgency=low
     missing \ escape for .deps.  Closes: #174013
   * Koblinger Egmont <egmont@uhulinux.hu>:
     Fix segfault with --status-fd.  Closes: #173618
+  * Colin Watson <cjwatson@debian.org>,
+    Andrew Suffield <asuffield@debian.org>:
+    Add .svn, {arch}, and .arch-ids to dpkg-source -i default regex.
+    Closes: #169359
 
  -- Wichert Akkerman <debian@extern.wiggy.net>  UNRELEASED
 

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 5b4eb3e565ccd016ea3d9bfbf5831b0eae6b7d1d..cdf205013936f2996323c6aaadb300c633a5d031 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -8,7 +8,7 @@ my %dirincluded;
 my %notfileobject;
 my $fn;
 
-$diff_ignore_default_regexp = '(?:^|/).*~$|(?:^|/)\..*\.swp|DEADJOE|\.cvsignore|(?:/CVS|/RCS|/\.deps)(?:$|/.*$)';
+$diff_ignore_default_regexp = '(?:^|/).*~$|(?:^|/)\..*\.swp|DEADJOE|\.cvsignore|(?:/(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn))(?:$|/.*$)';
 
 $sourcestyle = 'X';
 $dscformat = "1.0";