Browse Source

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

Guillem Jover 17 years ago
parent
commit
2d0f04e918
3 changed files with 8 additions and 1 deletions
  1. 4 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 2 1
      scripts/dpkg-source.pl

+ 4 - 0
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

+ 2 - 0
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)

+ 2 - 1
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