Browse Source

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

Guillem Jover 11 years ago
parent
commit
5e97e572b7
2 changed files with 3 additions and 1 deletions
  1. 1 0
      debian/changelog
  2. 2 1
      scripts/Dpkg/Source/Package.pm

+ 1 - 0
debian/changelog

@@ -75,6 +75,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low
   * Add support to dpkg-deb for reading the archive from standard input,
     except for --raw-extract which does not yet support it. Closes: #616614
     Based on a patch by Johannes Schauer <j.schauer@email.de>.
+  * Add ‘.mailmap’ to the default dpkg-source ignore lists.
 
   [ Updated manpages translations ]
   * German (Helge Kreutzmann).

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

@@ -71,7 +71,7 @@ my $diff_ignore_default_regex = '
 # File or directory names that should be ignored
 (?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|
 \.hg(?:tags|sigs)?|_darcs|\.git(?:attributes|modules)?|
-\.shelf|_MTN|\.be|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
+\.mailmap|\.shelf|_MTN|\.be|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
 ';
 # Take out comments and newlines
 $diff_ignore_default_regex =~ s/^#.*$//mg;
@@ -110,6 +110,7 @@ our @tar_ignore_default_pattern = qw(
 .hgignore
 .hgsigs
 .hgtags
+.mailmap
 .shelf
 .svn
 CVS