From 68bf666f23854a9370175337f5366b947d44eae6 Mon Sep 17 00:00:00 2001 From: Jari Aalto Date: Sun, 23 Sep 2007 01:20:05 +0200 Subject: [PATCH] dpkg-source: Add _MTN to $diff_ignore_default_regexp --- ChangeLog | 5 +++++ debian/changelog | 5 ++++- scripts/dpkg-source.pl | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 043aec3c..faa7b6ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-23 Jari Aalto + + * scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add + _MTN for monotone. + 2007-09-20 Frank Lichtenheld * scripts/dpkg-sources.pl (version): Don't use diff --git a/debian/changelog b/debian/changelog index 23c3b84c..eae7e112 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ dpkg (1.14.7) UNRELEASED; urgency=low Thanks to Brian M. Carlson. * Add Vcs-Browser and Vcs-Git fields to debian/control. + [ Frank Lichtenheld ] + * Add _MTN to dpkg-source -i default regex. Suggested by Jari Aalto. + [ Updated dpkg translations ] * Basque (Piarres Beobide). Closes: #440859 * Danish (Claus Hindsgaul). Closes: #441106 @@ -32,7 +35,7 @@ dpkg (1.14.7) UNRELEASED; urgency=low * Swedish (Peter Karlsson). * Korean (Sunjae Park). Closes: #443191 - -- Guillem Jover Thu, 06 Sep 2007 03:42:40 +0300 + -- Frank Lichtenheld Sun, 23 Sep 2007 01:22:24 +0200 dpkg (1.14.6) unstable; urgency=low diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 819c468b..83f63aa9 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -31,7 +31,7 @@ my $diff_ignore_default_regexp = ' (?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore|\.gitignore)$| # File or directory names that should be ignored (?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git| -\.shelf|\.bzr(?:\.backup|tags)?)(?:$|/.*$) +\.shelf|_MTN|\.bzr(?:\.backup|tags)?)(?:$|/.*$) '; # Take out comments and newlines -- 2.39.5