Add .git directory to default dpkg-source -i regex.

Suggested by Hans Ulrich Niedermann. Closes: #351885

diff --git a/ChangeLog b/ChangeLog
index efe517dd9369736fde8fb1831dcba21273dd2aac..58295c2c0d37b58b0f8e96c1115f253ad6622c96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-11  Frank Lichtenheld  <djpig@debian.org>
+
+       * scripts/dpkg-source.pl: Add .git to
+       $diff_ignore_default_regexp
+
 2006-02-10  Denis Barbier  <barbier@linuxfr.org>
 
        * scripts/dpkg-source.pl: Touch all patched files

diff --git a/debian/changelog b/debian/changelog
index 435b0453a55c41df29abfbeb5a88e6bf314d9472..f7a14ac8a92f482ce8c2ed7e31a439ac05bab8d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ dpkg (1.13.14~) UNRELEASED; urgency=low
     more complex setups (Julian Gilbey). Closes: #163061
   * Add files and dirs used by bzr to default dpkg-source -i regex
     (maximilian attems). Closes: #345164
+  * Add .git directory to default dpkg-source -i regex.
+    Suggested by Hans Ulrich Niedermann. Closes: #351885
   * dpkg-scanpackages can now output Packages files with multiple
     versions of a single package (Don Armstrong). Closes: #229589.
   * dpkg-scanpackages outputs help when given the --help or -h option

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 4159b5bae074cf44200434e3290dfd442bd5fca3..d5cd8e2eecabab7743ac5a51fae52340e1a0909c 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|\.bzr(?:\.backup)?)(?:$|/.*$)
+(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|_darcs|\.git|\.bzr(?:\.backup)?)(?:$|/.*$)
 ';
 
 # Take out comments and newlines