From: Guillem Jover <guillem@debian.org>
Date: Wed, 6 Jun 2007 23:08:49 +0000 (+0000)
Subject: Add '.shelf' to the default dpkg-source -i regex. Closes: #427827
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d0f04e918ca4fc74bd14f536acfc96efdcdc4f3;p=dpkg

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

diff --git a/ChangeLog b/ChangeLog
index 1906f4ca..b52edb3a 100644
--- 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 a178c243..24c9c550 100644
--- 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 6c0fd7d8..bcd3e400 100755
--- 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