Explorar el Código

Dpkg::Source::Package: Add ‘.gitmodules’ to the default ignore lists

Closes: #620490
Guillem Jover hace 15 años
padre
commit
106c21fc6c
Se han modificado 2 ficheros con 4 adiciones y 1 borrados
  1. 1 0
      debian/changelog
  2. 3 1
      scripts/Dpkg/Source/Package.pm

+ 1 - 0
debian/changelog

@@ -6,6 +6,7 @@ dpkg (1.16.1) UNRELEASED; urgency=low
 
   [ Guillem Jover ]
   * Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520
+  * Add ‘.gitmodules’ to the default dpkg-source ignore lists. Closes: #620490
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sat, 02 Apr 2011 09:21:26 +0200
 

+ 3 - 1
scripts/Dpkg/Source/Package.pm

@@ -49,7 +49,8 @@ our $diff_ignore_default_regexp = '
 # File-names that should be ignored (never directories)
 (?:^|/)(?:DEADJOE|\.arch-inventory|\.(?:bzr|cvs|hg|git)ignore)$|
 # File or directory names that should be ignored
-(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg(?:tags)?|_darcs|\.git(?:attributes)?|
+(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|
+\.hg(?:tags)?|_darcs|\.git(?:attributes|modules)?|
 \.shelf|_MTN|\.be|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
 ';
 # Take out comments and newlines
@@ -77,6 +78,7 @@ our @tar_ignore_default_pattern = qw(
 .git
 .gitattributes
 .gitignore
+.gitmodules
 .hg
 .hgignore
 .hgtags