From: Guillem Jover <guillem@debian.org>
Date: Wed, 7 Jun 2006 07:57:01 +0000 (+0000)
Subject: Add '.bzrtags' directory to default dpkg-source -i regex.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc19faf0107e82cfb22ac285939e1198c0d462b6;p=dpkg

Add '.bzrtags' directory to default dpkg-source -i regex.
Suggested by Adeodato Simó. Closes: #370392
---

diff --git a/ChangeLog b/ChangeLog
index c814a183..ca7bc9da 100644
--- 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 9e82567e..3bac6d6c 100644
--- 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 e8d43814..ea7fd6ad 100755
--- 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