Add '.gitignore' to the default dpkg-source -i regex. Closes: #409566

Thanks to Julien Cristau.

diff --git a/ChangeLog b/ChangeLog
index 8894f9fda55317785f60966a3ac274d40634887d..5c2dbf63f0e4eb76b6fc80e4919a735aae6f0911 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-04  Julien Cristau  <jcristau@debian.org>
+
+       * scripts/dpkg-source.pl ($diff_ignore_default_regexp): Add
+       '.gitignore'.
+
 2007-01-24  Guillem Jover  <guillem@debian.org>
 
        * scripts/controllib.pl: Move substvar initializations to ...

diff --git a/debian/changelog b/debian/changelog
index 47a1e48cce6443028a308ade74b9769e0b40a28d..5ff807c1c0273692090fcfdea84b1082792f5d00 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ dpkg (1.14.0) UNRELEASED; urgency=low
     now deprecated and should not be used anymore. It might be removed
     sometime in the future. Closes: #31634, #367712, #314462
     Thanks to Frank Lichtenheld.
+  * Add '.gitignore' to the default dpkg-source -i regex. Closes: #409566
+    Thanks to Julien Cristau.
 
   [ Updated dpkg translations ]
   * Romanian (Eddy Petrișor).

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 3f90984bddecfb5168828f96bb365b24168a8a02..6c3e86645f0905adbb0c03dfd63d153ffd22ead8 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -18,7 +18,7 @@ $diff_ignore_default_regexp = '
 # Ignore baz-style junk files or directories
 (?:^|/),,.*(?:$|/.*$)|
 # File-names that should be ignored (never directories)
-(?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore)$|
+(?:^|/)(?:DEADJOE|\.cvsignore|\.arch-inventory|\.bzrignore|\.gitignore)$|
 # File or directory names that should be ignored
 (?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|_darcs|\.git|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
 ';