From 6e5d8562fe17cefeb1a04aad26232a4cd7d3c15f Mon Sep 17 00:00:00 2001
From: Adam Heath <doogie@debian.org>
Date: Sat, 13 Sep 2003 22:19:13 +0000
Subject: [PATCH] Add .svn, {arch}, and .arch-ids to dpkg-source -i default
 regex.

---
 ChangeLog              | 5 +++++
 debian/changelog       | 4 ++++
 scripts/dpkg-source.pl | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9c7cc3a6..4fa33c70 100644
--- 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 905973f6..483d891c 100644
--- 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 5b4eb3e5..cdf20501 100755
--- 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";
-- 
2.39.5