Add '.shelf' to the default dpkg-source -i regex. Closes: #427827

Thanks to Adeodato Simó.

diff --git a/ChangeLog b/ChangeLog
index 1906f4ca9274d7eab3bba65c9cbb9f24bcdc4cd5..b52edb3a46b001bfc1cc35c022f75b665d479b1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-06  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add '.shelf'.
+
 2007-06-06  Guillem Jover  <guillem@debian.org>
 
        * scripts/dpkg-source.pl (%archadded): Move to an outer scope to

diff --git a/debian/changelog b/debian/changelog
index a178c243c3d6f21c818b9e35f0ac4e5900fbf9ca..24c9c5509e3afaf560d9674aee5b30ab734e3566 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dpkg (1.14.5) UNRELEASED; urgency=low
   * Add lpia support to ostable and triplettable.
   * Fix dpkg-source to not emit duplicated entries for the Architecture field
     in the .dsc file.
+  * Add '.shelf' to the default dpkg-source -i regex. Closes: #427827
+    Thanks to Adeodato Simó.
 
   [ Updated dselect translations ]
   * French (Christian Perrier)

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 6c0fd7d89b3452b2f4e45816f78f2586fafe92ff..bcd3e40059ee80d6ddcc8fd6d55f2b2f50b43922 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -32,7 +32,8 @@ my $diff_ignore_default_regexp = '
 # File-names that should be ignored (never directories)
 (?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore|\.gitignore)$|
 # File or directory names that should be ignored
-(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
+(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git|
+\.shelf|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
 ';
 
 # Take out comments and newlines