ignore vim swapfiles

diff --git a/ChangeLog b/ChangeLog
index d693b07f6b3ae08fde707f360da47390f09a56a9..10bae163f0ee63f6ce23cee669a59814235fa88a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jan  8 15:12:21 PST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-source.pl: add vim swapfiles to the default ignore regexp
+
 Mon Jan  8 10:38:28 PST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * po/fr.po: updated

diff --git a/debian/changelog b/debian/changelog
index 672a828dc399965e6a643882a42b5cf3cb672cda..13016a1e1f15f963c5b432bd4abecea0f745bcd4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dpkg (1.9.0) unstable; urgency=low
     a warning if used.
   * Update French translation, Closes: Bug#65284
   * Add French manpages, courtesy of Philippe Batailler
+  * Ingore vim swapfiles in dpkg-soruce, Closes: Bug#81630
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 6f7005867051cf695eb3fa654fa3deec7282b5d6..af13bf57e5a8203d7f4e122a6559bbd17c7c5cf1 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 = '^.*~$|DEAD_JOE|(?:/CVS|/RCS|/.deps)(?:$|/.*$)';
+$diff_ignore_default_regexp = '^.*~$|^\..*\.swp|DEAD_JOE|(?:/CVS|/RCS|/.deps)(?:$|/.*$)';
 
 $sourcestyle = 'X';
 $dscformat = "1.0";