[SCM] Debian package checker branch, master, updated. 2.4.3-17-g1330193
The following commit has been merged in the master branch:
commit a88c4da7095c6681c8c3d9e42f0ac8a1efee4bf9
Author: Niels Thykier <niels@thykier.net>
Date: Thu Dec 9 16:21:28 2010 +0100
Fix false-positive with extra-license-file with license.ui with test case.
* checks/files:
+ [NT] Fixed false-positive extra-license-file for license.ui files.
Thanks to Jeremy Sanders for the report. (Closes: #595941)
* t/tests/files-extra-license:
+ [NT] Added new test.
diff --git a/checks/files b/checks/files
index 56cf40b..bdbd585 100644
--- a/checks/files
+++ b/checks/files
@@ -757,7 +757,7 @@ foreach my $file (sort keys %{$info->index}) {
#
# Ignore extra license files in examples, since various package
# building software includes example packages with licenses.
- and not $file =~ m/\.(?:el|c|h|py|cc|pl|pm|hi|p_hi|html|php|rb|xpm|png|jpe?g|gif|svg|dtd)$/
+ 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/,
diff --git a/debian/changelog b/debian/changelog
index f6bc19b..fbad20e 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ lintian (2.4.4) UNRELEASED; urgency=low
* checks/debian-source-dir:
+ [NT] Added missing import of "Util" perl module. Thanks to David
Bremner for the patch.
+ * checks/files:
+ + [NT] Fixed false-positive extra-license-file for license.ui files.
+ Thanks to Jeremy Sanders for the report. (Closes: #595941)
* checks/menu-format.desc:
+ [CW] Fix several typos.
* checks/menus.desc:
@@ -41,6 +44,8 @@ lintian (2.4.4) UNRELEASED; urgency=low
* debian/compat:
+ [NT] Bump debhelper comat to 7.
+ * t/tests/files-extra-license:
+ + [NT] Added new test.
* t/tests/rules-not-makefile:
+ [NT] Added new test.
* t/tests/scripts-missing-dep:
diff --git a/t/tests/files-extra-license/debian/debian/docs b/t/tests/files-extra-license/debian/debian/docs
new file mode 100644
index 0000000..9c789d9
--- /dev/null
+++ b/t/tests/files-extra-license/debian/debian/docs
@@ -0,0 +1 @@
+license*
diff --git a/t/tests/files-extra-license/debian/license.txt b/t/tests/files-extra-license/debian/license.txt
new file mode 100644
index 0000000..473e105
--- /dev/null
+++ b/t/tests/files-extra-license/debian/license.txt
@@ -0,0 +1 @@
+Lintian should pick up this as an extra license file.
diff --git a/t/tests/files-extra-license/debian/license.ui b/t/tests/files-extra-license/debian/license.ui
new file mode 100644
index 0000000..afae290
--- /dev/null
+++ b/t/tests/files-extra-license/debian/license.ui
@@ -0,0 +1,2 @@
+Lintian should not mistake this QT UI file for a license file.
+
diff --git a/t/tests/files-extra-license/desc b/t/tests/files-extra-license/desc
new file mode 100644
index 0000000..1f7db60
--- /dev/null
+++ b/t/tests/files-extra-license/desc
@@ -0,0 +1,6 @@
+Testname: files-extra-license
+Sequence: 6000
+Version: 1.0
+Description: Test for extra license files
+Test-For:
+ extra-license-file
diff --git a/t/tests/files-extra-license/tags b/t/tests/files-extra-license/tags
new file mode 100644
index 0000000..2dbaffc
--- /dev/null
+++ b/t/tests/files-extra-license/tags
@@ -0,0 +1 @@
+W: files-extra-license: extra-license-file usr/share/doc/files-extra-license/license.txt
--
Debian package checker
Reply to: