[SCM] Debian package checker branch, master, updated. 2.5.2-42-g8543ed2

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 8543ed2db3e1efd74d4f2fd8126d9570dbe33d73
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Aug 20 11:06:57 2011 +0200

    Fixed F-P "extra-license-file" for liblicense
    
    This means an exception for manpages, static libraries, .pc-, elf-
    and pyshared-data-files.

diff --git a/checks/files b/checks/files
index 4df987c..6c1a58a 100644
--- a/checks/files
+++ b/checks/files
@@ -820,11 +820,18 @@ 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|[ch]|py|cc|pl|pm|hi|p_hi|html|php|rb|xpm|png|jpe?g|gif|svg|dtd|ui)$/
+	and not $file =~ m/\.(?:el|[ch]|py|cc|pl|pm|hi|p_hi|html|php|rb|xpm|png|jpe?g|gif|svg|dtd|ui|pc)$/
 	and not $file =~ m,^usr/share/zope/Products/.*\.(?:dtml|pt|cpt)$,
 	and not $file =~ m,/under\S+License\.docbook$,
 	and not $file =~ m,^usr/share/doc/[^/]+/examples/,
+	and not $file =~ m,^usr/share/man/(?:[^/]+/)?man\d/,o # liblicense has a manpage called license
+	and not $file =~ m,^usr/share/pyshared-data/,o        # liblicense (again)
 	and not defined $link) {
+
+	# okay, we cannot rule it out based on file name; but if it is an elf or a static
+	# library, we also skip it.  (In case you hadn't guessed; liblicense)
+	my $fileinfo = $info->file_info->{$file};
+	next if $fileinfo && ($fileinfo =~ m/^[^,]*\bELF\b/) or ($fileinfo =~ m/\bcurrent ar archive\b/);
 	tag 'extra-license-file', $file;
     }
 
diff --git a/debian/changelog b/debian/changelog
index 0174e89..86cf4a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ lintian (2.5.3) UNRELEASED; urgency=low
       be the first dependency if it is only included in the perl
       from experimental.  Thanks to Dominic Hargreaves for the
       report and the patch.  (Closes: #637793)
+  * checks/files:
+    + [NT] Added exceptions to "extra-license-file" for manpages,
+      static libraries, .pc-, elf and pyshared-data-files.  This
+      covers all the false-positives currently found in the liblicense
+      package.  (Closes: #617901)
 
   * collection/fields{,.desc}:
     + [NT] Removed, no longer used.

-- 
Debian package checker