dpkg-source: Add _MTN to $diff_ignore_default_regexp

diff --git a/ChangeLog b/ChangeLog
index 043aec3ce660586ec047aeeb421b85d0d7da264a..faa7b6ea030863ac1201df0f0119b386d2571664 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-23  Jari Aalto  <jari.aalto@cante.net>
+
+       * scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add
+       _MTN for monotone.
+
 2007-09-20  Frank Lichtenheld  <djpig@debian.org>
 
        * scripts/dpkg-sources.pl (version): Don't use

diff --git a/debian/changelog b/debian/changelog
index 23c3b84c29a4f069ed03d0a6f38d01921c2c6276..eae7e112dc85e08ac7ca150101e40d4e55e0719f 100644 (file)
--- 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 <guillem@debian.org>  Thu, 06 Sep 2007 03:42:40 +0300
+ -- Frank Lichtenheld <djpig@debian.org>  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 819c468b156bc6863730db3a8c5ab61874758cb4..83f63aa9a30c3c979c11b98eda59ed39914cbcbf 100755 (executable)
--- 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