[lintian] 01/01: c/cruft: .r0 files should not trigger svn-conflict-file
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit cfdb7900403f7db35c628d8a8c598175e33ba35e
Author: Niels Thykier <niels@thykier.net>
Date: Tue Jul 21 18:49:36 2015 +0200
c/cruft: .r0 files should not trigger svn-conflict-file
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/cruft.pm | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/checks/cruft.pm b/checks/cruft.pm
index 591d0c1..dbc5039 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -304,7 +304,7 @@ my @file_checks = (
[qr,^(.+/)?\.arch-inventory$, => 'arch-inventory-file'],
[qr,^(.+/)?\.hgtags$, => 'hg-tags-file'],
[qr,^(.+/)?\.\#(.+?)\.\d+(\.\d+)*$, => 'cvs-conflict-copy'],
- [qr,^(.+/)?(.+?)\.(r\d+)$, => 'svn-conflict-file'],
+ [qr,^(.+/)?(.+?)\.(r[1-9]\d*)$, => 'svn-conflict-file'],
[qr,\.(orig|rej)$, => 'patch-failure-file', 1],
[qr,((^|/)\.[^/]+\.swp|~)$, => 'editor-backup-file', 1],
);
diff --git a/debian/changelog b/debian/changelog
index 2623dc6..7c68d00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,12 @@ lintian (2.5.34) UNRELEASED; urgency=medium
* checks/binaries.desc:
+ [NT] Apply patch from Guillem Jover to improve the tag
description of the LFS tag. (Closes: #792167)
+ * checks/cruft.pm:
+ + [NT] Avoid svn-conflict-file tag for ".r0" files, since
+ there cannot be a conflict involving revision 0.
+ Thanks to Andreas Beckmann for the report.
+ (Closes: #793068)
+
* checks/systemd.pm:
+ [NT] Apply patches from Felipe Sateler to ignore known
masked init.d scripts. (Closes: #792501)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: