[lintian] 01/01: c/files: Fix F-P with extra-license-file
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository lintian.
commit 6d1634f833fda2cbce13cb3d3521239ec48c40c4
Author: Niels Thykier <niels@thykier.net>
Date: Sat Jun 6 22:18:44 2015 +0200
c/files: Fix F-P with extra-license-file
Signed-off-by: Niels Thykier <niels@thykier.net>
---
checks/files.pm | 9 ++++++++-
debian/changelog | 2 ++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/checks/files.pm b/checks/files.pm
index e776151..902b35c 100644
--- a/checks/files.pm
+++ b/checks/files.pm
@@ -1134,7 +1134,7 @@ sub run {
and not $fname =~ m{ \. (?:
# Common "non-license" file extensions...
el|[ch]|py|cc|pl|pm|hi|p_hi|html|php|rb|xpm
- |png|jpe?g|gif|svg|dtd|ui|pc
+ |png|jpe?g|gif|svg|dtd|ui|pc|mk|lisp
) \Z}xsm
and not $fname=~ m,^usr/share/zope/Products/.*\.(?:dtml|pt|cpt)$,
and not $fname =~ m,/under\S+License\.docbook$,
@@ -1143,6 +1143,13 @@ sub run {
and not $fname =~ m,^usr/share/man/(?:[^/]+/)?man\d/,o
# liblicense (again)
and not $fname =~ m,^usr/share/pyshared-data/,o
+ # Some GNOME/GTK software uses these to show the "license
+ # header".
+ and not $fname =~ m,
+ ^usr/share/(?:gnome/)?help/[^/]+/[^/]+/license\.page$
+ ,x
+ # base-files (which is required to ship them)
+ and not $fname =~ m,^usr/share/common-licenses/[^/]+$,o
and not defined $link
) {
diff --git a/debian/changelog b/debian/changelog
index ab6b36e..95c7bc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ lintian (2.5.32) UNRELEASED; urgency=medium
directories.
+ [BR] Avoid a false positive in jsom for defaultpresets.xml
from openmapstreet.
+ + [NT] Tweak the "extra-license-file" check to avoid some
+ common false-positives.
* checks/java.pm:
+ [NT] Fix "off-by-one" in the check for the maximum permitted
Java major version.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: