From: Wichert Akkerman <wakkerma@debian.org>
Date: Wed, 2 Jan 2002 15:10:54 +0000 (+0000)
Subject: Update default ignore expression to also match *~ and *.swp in subdirs
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eef77106674d6838b9a8875dd7a64c9797afd44;p=dpkg

Update default ignore expression to also match *~ and *.swp in subdirs
---

diff --git a/ChangeLog b/ChangeLog
index 910db8dc..cb5ba3cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan  2 16:08:02 CET 2002 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-source.pl: Update default ignore expression to also
+    match *~ and *.swp in subdirs.
+
 Wed Jan  2 15:00:26 CET 2002 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/dpkg-checkbuilddeps.pl: use space seperated output instead
diff --git a/debian/changelog b/debian/changelog
index ad12f01e..8eacd336 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,8 @@ dpkg (1.10) unstable; urgency=low
     #118420.
   * Use space seperated output instead of comma seperated in
     dpkg-checkbuilddeps
+  * Update default ignore expression in dpkg-source to also match *~ and
+    *.swp in subdirs. Closes: Bug#127458
 
  -- Wichert Akkerman <wakkerma@debian.org>  Mon, 20 Aug 2001 14:54:38 +0200
 
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index a55cdd7e..47f3f308 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|(?:/CVS|/RCS|/.deps)(?:$|/.*$)';
+$diff_ignore_default_regexp = '(?:^|/).*~$|(?:^|/)\..*\.swp|DEADJOE|(?:/CVS|/RCS|/.deps)(?:$|/.*$)';
 
 $sourcestyle = 'X';
 $dscformat = "1.0";