Add files and dirs used by bzr to default dpkg-source -i regex

(maximilian attems). Closes: #345164

diff --git a/ChangeLog b/ChangeLog
index b58d739a599d65a382230dee201dd6ef1dac1ceb..185bceadaf59d77ae2ec42cc78f62018611b8bdf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-29  maximilian attems  <debian@sternwelten.at>
+
+       * scripts/dpkg-source.pl: Add files and
+       dirs used by bzr to $diff_ignore_default_regexp.
+
 2006-01-29  Julian Gilbey  <jdg@debian.org>
 
        * scripts/dpkg-buildpackage.sh: Create .changes

diff --git a/debian/changelog b/debian/changelog
index cddf9f1517ebfe38131e30f512e82be9a20498b4..6add50d7c6b71b83cfba50f40ec36ca533282585 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ dpkg (1.13.14~) UNRELEASED; urgency=low
     later (Julian Gilbey). Closes: #217963
   * Change heuristics of dpkg-buildpackage's gpg check to allow for
     more complex setups (Julian Gilbey). Closes: #163061
+  * Add files and dirs used by bzr to default dpkg-source -i regex
+    (maximilian attems). Closes: #345164
 
  -- Guillem Jover <guillem@debian.org>  Sun, 29 Jan 2006 06:02:58 +0200
 

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