From 2d0f04e918ca4fc74bd14f536acfc96efdcdc4f3 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 6 Jun 2007 23:08:49 +0000 Subject: [PATCH] =?utf8?q?Add=20'.shelf'=20to=20the=20default=20dpkg-sourc?= =?utf8?q?e=20-i=20regex.=20Closes:=20#427827=20Thanks=20to=20Adeodato=20S?= =?utf8?q?im=C3=B3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ChangeLog | 4 ++++ debian/changelog | 2 ++ scripts/dpkg-source.pl | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1906f4ca..b52edb3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-06-06 Guillem Jover + + * scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add '.shelf'. + 2007-06-06 Guillem Jover * 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 -- 2.39.5