Add .#* to the default ignore filter.

diff --git a/ChangeLog b/ChangeLog
index 62490527c77ca9faa07e79ee2cbc35286db43195..0f4732c2e2fd50fe9115cf0391d482f637eebb10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 27 10:57:54 CST 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/dpkg-source.pl: Add .#* to the default ignore filter.
+
 Mon Oct 27 09:49:29 CST 2003 Adam Heath <doogie@debian.org>
 
   * scripts/dpkg-scanpackages.pl: Add -u -a<arch> commands.

diff --git a/debian/changelog b/debian/changelog
index 0a5c2f71567254ccffb062824610fc09281b22d0..ab19b01f7ba828dd5e4b091fe97e51ed20ea9234 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ dpkg (1.10.17) unstable; urgency=medium
   * Goswin Brederlow <brederlo@informatik.uni-tuebingen.de>:
     Add -u in dpkg-scanpackages.  Closes: #214123.
     Add -a<arch> command to dpkg-scanpackages.
+  * Add .#* to dpkg-source's default ignore filter.  Closes: #217380.
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index f5dfdd742fceafa6599d1bc09b90ebf8fe00ceee..70a6281dcff3a56f28bb0b3c2739ab620cddabb9 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|\{arch\}|\.arch-ids|\.svn))(?:$|/.*$)';
+$diff_ignore_default_regexp = '(?:^|/)\.#.*$|(?:^|/).*~$|(?:^|/)\..*\.swp|DEADJOE|\.cvsignore|(?:/(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn))(?:$|/.*$)';
 
 $sourcestyle = 'X';
 $dscformat = "1.0";