[SCM] Debian package checker branch, master, updated. 2.2.17-29-g600fa8d
The following commit has been merged in the master branch:
commit 026ae59f2854fbe3edfd0320593f0d6e885ac642
Author: Russ Allbery <rra@debian.org>
Date: Thu Nov 12 15:14:54 2009 -0800
Improvements to copyright boilerplate checks
* checks/copyright-file{,.desc}:
+ [RA] copyright-lists-upstream-authors-with-dh_make-boilerplate
removed, as some package maintainers prefer to use Author(s) and
have filled out the copyright file.
+ [RA] Add additional dh_make template strings to the
helper-templates-in-copyright check, including the templates for
upstream author or copyright holder, which effectively replaces
copyright-lists-upstream-authors-with-dh_make-boilerplate with far
fewer false positives.
+ [RA] Remove a duplication of the check for "This copyright info was
automatically extracted from the perl module" by dh-make-perl, and
ensure that this is copyright-contains-dh-make-perl-boilerplate and
not helper-templates-in-copyright, since it is lower severity.
diff --git a/checks/copyright-file b/checks/copyright-file
index 293f9f0..e4d2b1d 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -149,6 +149,9 @@ my $wrong_directory_detected = 0;
if (m,\<fill in (?:http/)?ftp site\>, or m/\<Must follow here\>/) {
tag "helper-templates-in-copyright", "";
}
+if (m,\<Put the license of the package here,) {
+ tag 'helper-templates-in-copyright';
+}
if (m,(usr/share/common-licenses/(?:GPL|LGPL|BSD|Artistic)\.gz),) {
tag "copyright-refers-to-compressed-license", $1;
@@ -262,12 +265,15 @@ if (m,(?:under )?(?:the )?(?:same )?(?:terms )?as Perl itself,i &&
# Checks for various packaging helper boilerplate.
-if (m/^This copyright info was automatically extracted from the perl module\./) {
- tag "helper-templates-in-copyright", "";
+if (m,\<put author[\'\(]s\)? name and email here\>,) {
+ tag 'helper-templates-in-copyright';
+}
+if (m,\<Copyright \(C\) YYYY Name OfAuthor\>,) {
+ tag 'helper-templates-in-copyright';
}
-if (m,Upstream Author\(s\),) {
- tag "copyright-lists-upstream-authors-with-dh_make-boilerplate";
+if (m/^This copyright info was automatically extracted from the perl module\./m) {
+ tag 'copyright-contains-dh-make-perl-boilerplate';
}
if (m,url://example\.com,) {
@@ -277,9 +283,6 @@ if (m,url://example\.com,) {
if (m{\# Please also look if there are files or directories which have a\n\# different copyright/license attached and list them here\.}) {
tag "copyright-contains-dh_make-todo-boilerplate", "";
}
-if (m{This copyright info was automatically extracted from the perl module\.\nIt may not be accurate, so you better check the module sources\nif you don\'t want to get into legal troubles\.}) {
- tag "copyright-contains-dh-make-perl-boilerplate", "";
-}
if (m,The\s+Debian\s+packaging\s+is\s+\(C\)\s+\d+,i) {
tag 'copyright-with-old-dh-make-debian-copyright';
diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index 2b05fd1..b984481 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -119,9 +119,11 @@ Info: The /usr/share/doc/<i>pkg</i>/copyright file refers to the old postal
Tag: helper-templates-in-copyright
Severity: important
Certainty: certain
-Info: The /usr/share/doc/<i>pkg</i>/copyright file still contains the template
- contents from a packaging helper. Please include the actual license and
- download information about the package.
+Info: The /usr/share/doc/<i>pkg</i>/copyright file still contains
+ template markers from a packaging helper. Please fill in the actual
+ license, upstream copyright holders, and download information about the
+ package and remove any remaining templates generated by the packaging
+ helper.
Tag: copyright-refers-to-compressed-license
Severity: important
@@ -204,18 +206,6 @@ Info: The strings "GNU Lesser General Public License", "GNU Library
If the copyright file must mention the LGPL for reasons other than stating
the license of the package, please add a Lintian override.
-Tag: copyright-lists-upstream-authors-with-dh_make-boilerplate
-Severity: normal
-Certainty: certain
-Info: There is "Upstream Author(s)" in your copyright file. This was most
- likely a remnant from the dh_make template.
- .
- There's either one upstream author, in which case you should remove the
- "(s)", or there are several upstream authors, in which case you should
- remove the "(" and ")".
- .
- o/~ join us now and carefully edit debian/copyright files! o/~
-
Tag: copyright-has-url-from-dh_make-boilerplate
Severity: normal
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 7b8f99f..a46f427 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
lintian (2.2.18) UNRELEASED; urgency=low
+ * Summary of tag changes:
+ + Removed:
+ - copyright-lists-upstream-authors-with-dh_make-boilerplate
+
* checks/changelog-file:
+ [FL] Avoid various Perl warnings which can be caused by
completly broken changelog files.
@@ -10,12 +14,24 @@ lintian (2.2.18) UNRELEASED; urgency=low
+ [ADB] Fix an uninitialised value warning when processing a
-dev package which has no Depends: fields. Thanks, Lucas
Nussbaum.
- * checks/copyright-file:
+ * checks/copyright-file{,.desc}:
+ [FL] Add special exception to no-copyright-file for perl.
See #522827 for discussion. (Closes: #553262)
+ [FL] Extend match for exceptions to copyright-refers-to-symlink-license
to catch more ways to specify Perl's license. Patch from
Salvatore Bonaccorso. (Closes: #549596)
+ + [RA] copyright-lists-upstream-authors-with-dh_make-boilerplate
+ removed, as some package maintainers prefer to use Author(s) and
+ have filled out the copyright file.
+ + [RA] Add additional dh_make template strings to the
+ helper-templates-in-copyright check, including the templates for
+ upstream author or copyright holder, which effectively replaces
+ copyright-lists-upstream-authors-with-dh_make-boilerplate with far
+ fewer false positives.
+ + [RA] Remove a duplication of the check for "This copyright info was
+ automatically extracted from the perl module" by dh-make-perl, and
+ ensure that this is copyright-contains-dh-make-perl-boilerplate and
+ not helper-templates-in-copyright, since it is lower severity.
* checks/cruft:
+ [FL] Add automake1.11 to list of autotools packages. Thanks,
Laurent Bigonville. (Closes: #551051)
diff --git a/t/tests/copyright-file-general/desc b/t/tests/copyright-file-general/desc
index 88c862c..604d9c8 100644
--- a/t/tests/copyright-file-general/desc
+++ b/t/tests/copyright-file-general/desc
@@ -11,7 +11,6 @@ Test-For:
copyright-file-contains-full-gpl-license
copyright-file-is-symlink
copyright-has-url-from-dh_make-boilerplate
- copyright-lists-upstream-authors-with-dh_make-boilerplate
copyright-refers-to-bad-php-license
copyright-refers-to-compressed-license
copyright-refers-to-incorrect-directory
diff --git a/t/tests/copyright-file-general/tags b/t/tests/copyright-file-general/tags
index c916bd7..c951c39 100644
--- a/t/tests/copyright-file-general/tags
+++ b/t/tests/copyright-file-general/tags
@@ -17,6 +17,5 @@ W: copyright-full-apache-2: copyright-without-copyright-notice
W: copyright-iso-8859-1: debian-copyright-file-uses-obsolete-national-encoding at line 3
W: copyright-misc-errors: copyright-contains-dh-make-perl-boilerplate
W: copyright-misc-errors: copyright-has-url-from-dh_make-boilerplate
-W: copyright-misc-errors: copyright-lists-upstream-authors-with-dh_make-boilerplate
W: copyright-misc-errors: copyright-refers-to-nonexistent-license-file usr/share/common-licenses/GPL2
W: copyright-old-style: copyright-without-copyright-notice
diff --git a/t/tests/generic-dh-make-2005/tags b/t/tests/generic-dh-make-2005/tags
index bcefa05..1c1c200 100644
--- a/t/tests/generic-dh-make-2005/tags
+++ b/t/tests/generic-dh-make-2005/tags
@@ -1,5 +1,7 @@
E: generic-dh-make-2005: description-is-dh_make-template
E: generic-dh-make-2005: helper-templates-in-copyright
+E: generic-dh-make-2005: helper-templates-in-copyright
+E: generic-dh-make-2005: helper-templates-in-copyright
E: generic-dh-make-2005: section-is-dh_make-template
I: generic-dh-make-2005 source: debian-watch-file-is-missing
I: generic-dh-make-2005: extended-description-is-probably-too-short
diff --git a/t/tests/generic-dh-make-2008/desc b/t/tests/generic-dh-make-2008/desc
index 700fa79..43f4cb3 100644
--- a/t/tests/generic-dh-make-2008/desc
+++ b/t/tests/generic-dh-make-2008/desc
@@ -8,7 +8,6 @@ Test-For:
bad-homepage
copyright-contains-dh_make-todo-boilerplate
copyright-has-url-from-dh_make-boilerplate
- copyright-lists-upstream-authors-with-dh_make-boilerplate
copyright-with-old-dh-make-debian-copyright
copyright-without-copyright-notice
debian-watch-file-is-missing
diff --git a/t/tests/generic-dh-make-2008/tags b/t/tests/generic-dh-make-2008/tags
index 08aa4db..fe6ea15 100644
--- a/t/tests/generic-dh-make-2008/tags
+++ b/t/tests/generic-dh-make-2008/tags
@@ -1,4 +1,7 @@
E: generic-dh-make-2008: description-is-dh_make-template
+E: generic-dh-make-2008: helper-templates-in-copyright
+E: generic-dh-make-2008: helper-templates-in-copyright
+E: generic-dh-make-2008: helper-templates-in-copyright
E: generic-dh-make-2008: section-is-dh_make-template
I: generic-dh-make-2008 source: debian-watch-file-is-missing
I: generic-dh-make-2008: copyright-with-old-dh-make-debian-copyright
@@ -29,7 +32,6 @@ W: generic-dh-make-2008 source: superfluous-clutter-in-homepage <insert the upst
W: generic-dh-make-2008: bad-homepage <insert the upstream URL, if relevant>
W: generic-dh-make-2008: copyright-contains-dh_make-todo-boilerplate
W: generic-dh-make-2008: copyright-has-url-from-dh_make-boilerplate
-W: generic-dh-make-2008: copyright-lists-upstream-authors-with-dh_make-boilerplate
W: generic-dh-make-2008: copyright-without-copyright-notice
W: generic-dh-make-2008: new-package-should-close-itp-bug
W: generic-dh-make-2008: readme-debian-contains-debmake-template
--
Debian package checker
Reply to: