Просмотр исходного кода

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

Guillem Jover лет назад: 19
Родитель
Сommit
9ddc488730
3 измененных файлов с 8 добавлено и 1 удалено
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 1 1
      scripts/dpkg-source.pl

+ 5 - 0
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 ...

+ 2 - 0
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).

+ 1 - 1
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)?)(?:$|/.*$)
 ';