Add '.bzrtags' directory to default dpkg-source -i regex.

Suggested by Adeodato Simó. Closes: #370392

diff --git a/ChangeLog b/ChangeLog
index c814a1833b59ee2ca3666a11ce40b514ddbd4fac..ca7bc9da18230f71437cd702fd7baf35d9179f36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-07  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add
+       '.bzrtags'.
+
 2006-06-04  Guillem Jover  <guillem@debian.org>
 
        * configure.ac: Bump version to 1.13.22~.

diff --git a/debian/changelog b/debian/changelog
index 9e82567e589f48607679241f3772c70b051eef5c..3bac6d6cb710251c650fc903908dacab4d5807fb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ dpkg (1.13.22~) UNRELEASED; urgency=low
   [ Guillem Jover ]
   * Version the po4a Build-Depends to >= 0.23 as we are using options
     introduced in that version. Thanks to Sergio Gelato. Closes: #370536
+  * Add '.bzrtags' directory to default dpkg-source -i regex.
+    Suggested by Adeodato Simó. Closes: #370392
 
   [ Updated dpkg Translations ]
   * Romanian (Eddy Petrişor).

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index e8d438145adc87800b221e90591b84c3b2829f08..ea7fd6ad830da3228a27f0a2db1dc9a3a50376b6 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -20,7 +20,7 @@ $diff_ignore_default_regexp = '
 # File-names that should be ignored (never directories)
 (?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore)$|
 # File or directory names that should be ignored
-(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|_darcs|\.git|\.bzr(?:\.backup)?)(?:$|/.*$)
+(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|_darcs|\.git|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
 ';
 
 # Take out comments and newlines