[dpkg] 180/200: Dpkg::Source::Package: Add ‘.mnt-ignore’ to the default ignore lists

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository dpkg.

commit dded9f5b0699f5ddead03e46b58ce674effe7fe4
Author: Nicolas Boulenguez <nicolas at debian.org>
Date:   Sat Feb 18 15:18:54 2017 +0100

    Dpkg::Source::Package: Add ‘.mnt-ignore’ to the default ignore lists
    
    Closes: #855450
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 debian/changelog               | 3 +++
 scripts/Dpkg/Source/Package.pm | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9e4e1ff..74296a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ dpkg (1.18.23) UNRELEASED; urgency=medium
       for unknown executable formats instead of relying on objdump doing so.
     - Do not parse bogus ELF binaries in Dpkg::Shlibs::Objdump::get_format().
       Reported by Niels Thykier <niels at thykier.net>.
+    - Add ‘.mnt-ignore’ to the default ignore lists in Dpkg::Source::Package,
+      as we were already ignoring the ‘_MTN’ pathnames. Closes: #855450
+      Thanks to Nicolas Boulenguez <nicolas at debian.org>.
   * Documentation:
     - Clarify the requirements for deb-conffile(5) pathnames. Closes: #854417
       Proposed by Dieter Adriaenssens <dieter.adriaenssens at gmail.com>.
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index 8eb6a7c..a767846 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -67,7 +67,7 @@ my $diff_ignore_default_regex = '
 # Ignore baz-style junk files or directories
 (?:^|/),,.*(?:$|/.*$)|
 # File-names that should be ignored (never directories)
-(?:^|/)(?:DEADJOE|\.arch-inventory|\.(?:bzr|cvs|hg|git)ignore)$|
+(?:^|/)(?:DEADJOE|\.arch-inventory|\.(?:bzr|cvs|hg|git|mtn-)ignore)$|
 # File or directory names that should be ignored
 (?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|
 \.hg(?:tags|sigs)?|_darcs|\.git(?:attributes|modules|review)?|
@@ -112,6 +112,7 @@ our @tar_ignore_default_pattern = qw(
 .hgsigs
 .hgtags
 .mailmap
+.mtn-ignore
 .shelf
 .svn
 CVS

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git