[SCM] Debian package checker branch, master, updated. 2.4.3-110-g9b91a86
The following commit has been merged in the master branch:
commit 9b91a86686d009beeb9aa337e74ce07de44ff5dd
Author: Niels Thykier <niels@thykier.net>
Date: Wed Jan 5 09:35:37 2011 +0100
Made extra-license-file check ignore all files marked executable.
Removed exception for bin-directories and usr/games as files there
must be executable (and we have a separate check for that).
* checks/files{,.desc}
+ [NT] Fixed false-positive extra-license-file for games. Instead
of skipping PATH directories Lintian now ignores all executable
files. (Closes: #608866)
diff --git a/checks/files b/checks/files
index e1bee21..02320e3 100644
--- a/checks/files
+++ b/checks/files
@@ -742,8 +742,10 @@ foreach my $file (@{$info->sorted_index}) {
if ($file =~ m,(?:copying|licen[cs]e)(?:\.[^/]+)?$,i
# Ignore some common extensions for source or compiled extension files.
# There was at least one file named "license.el". These are probably
- # license-displaying code, not license files. Also ignore binaries in
- # /usr/bin and friends.
+ # license-displaying code, not license files. Also ignore executable
+ # files in general. This means we get false-negatives for licenses
+ # files marked executable, but these will trigger a warning about being
+ # executable. (See #608866)
#
# Another exception is made for .html and .php because preserving
# working links is more important than saving some bytes, and
@@ -757,11 +759,10 @@ foreach my $file (@{$info->sorted_index}) {
#
# Ignore extra license files in examples, since various package
# building software includes example packages with licenses.
+ and ($operm & 0111) == 0
and not $file =~ m/\.(?:el|c|h|py|cc|pl|pm|hi|p_hi|html|php|rb|xpm|png|jpe?g|gif|svg|dtd|ui)$/
and not $file =~ m,^usr/share/zope/Products/.*\.(?:dtml|pt|cpt)$,
and not $file =~ m,/under\S+License\.docbook$,
- and not $file =~ m,^(?:usr/)?s?bin/,
- and not $file =~ m,^usr/games/,
and not $file =~ m,^usr/share/doc/[^/]+/examples/,
and not defined $link) {
tag "extra-license-file", "$file";
diff --git a/debian/changelog b/debian/changelog
index 9b685e9..27b80e2 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,8 +43,9 @@ lintian (2.4.4) UNRELEASED; urgency=low
the patch. (Closes: #591331)
+ [NT] Fixed spelling of metapackage in empty-binary-package tag
description. (Closes: #591300)
- + [NT] Fixed false-positive extra-license-file for games.
- (Closes: #608866)
+ + [NT] Fixed false-positive extra-license-file for games. Instead
+ of skipping PATH directories Lintian now ignores all executable
+ files. (Closes: #608866)
* checks/menu-format.desc:
+ [CW] Fix several typos.
* checks/menus.desc:
--
Debian package checker
Reply to: