[SCM] Debian package checker branch, master, updated. 2.1.3-24-g999c0d7
The following commit has been merged in the master branch:
commit 88c1689c8e35b40513b822b4442c21d81fd7fa16
Author: Russ Allbery <rra@debian.org>
Date: Mon Dec 29 18:23:19 2008 -0800
Warn about old dh_make Debian packaging copyright boilerplate
* checks/copyright-file{,.desc}:
+ [RA] Warn (severity: wishlist) about the old dh_make packaging
copyright, which used (C) without the word or symbol. Based on a
patch by Raphael Geissert. (Closes: #497347)
diff --git a/checks/copyright-file b/checks/copyright-file
index 3b5430e..571dcd8 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -262,6 +262,10 @@ if (m{This copyright info was automatically extracted from the perl module\.\nIt
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';
+}
+
if ($found && !$linked && !/(Copyright|Copr\.|\302\251)(.*|[\(C\):\s]+)\b\d{4}\b|\bpublic\s+domain\b/i) {
tag 'copyright-without-copyright-notice';
}
diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index 60c245c..24df08d 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -255,6 +255,15 @@ Info: The string "This copyright info was automatically extracted..."
check the whole source to find additional copyright/license, or that
you didn't remove that paragraph after having done so.
+Tag: copyright-with-old-dh-make-debian-copyright
+Severity: wishlist
+Certainty: certain
+Info: The copyright file contains the incomplete Debian packaging
+ copyright boilerplate from older versions of <tt>dh_make</tt>.
+ <tt>(C)</tt> is not considered as a valid way to express the copyright
+ ownership. The word <tt>Copyright</tt> or the © symbol should be used
+ instead or in addition to <tt>(C)</tt>.
+
Tag: copyright-without-copyright-notice
Severity: normal
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 4512cc7..e719819 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ lintian (2.1.4) UNRELEASED; urgency=low
- control-interpreter-in-usr-local (split from
interpreter-in-usr-local)
- control-interpreter-without-depends
+ - copyright-with-old-dh-make-debian-copyright
- desktop-mimetype-without-update-call
- forbidden-postrm-interpreter
- preinst-interpreter-without-predepends
@@ -14,6 +15,10 @@ lintian (2.1.4) UNRELEASED; urgency=low
- desktop-file-but-no-dh_desktop-call
- interpreter-without-predep
+ * checks/copyright-file{,.desc}:
+ + [RA] Warn (severity: wishlist) about the old dh_make packaging
+ copyright, which used (C) without the word or symbol. Based on a
+ patch by Raphael Geissert. (Closes: #497347)
* checks/menu-format{,.desc}:
+ [RA] If a *.desktop file contains a MimeType key, check that the
postinst calls update-desktop-database. (Closes: #488832)
diff --git a/t/tests/6500_generic-dh-make-2008.desc b/t/tests/6500_generic-dh-make-2008.desc
index 4a81b2e..2f38cfe 100644
--- a/t/tests/6500_generic-dh-make-2008.desc
+++ b/t/tests/6500_generic-dh-make-2008.desc
@@ -8,6 +8,7 @@ Test-For:
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
description-is-dh_make-template
@@ -19,3 +20,4 @@ Test-For:
section-is-dh_make-template
superfluous-clutter-in-homepage
wrong-bug-number-in-closes
+References: Debian Bug#497347
diff --git a/t/tests/generic-dh-make-2008/tags b/t/tests/generic-dh-make-2008/tags
index f5f86d9..bd76918 100644
--- a/t/tests/generic-dh-make-2008/tags
+++ b/t/tests/generic-dh-make-2008/tags
@@ -1,6 +1,7 @@
E: generic-dh-make-2008: description-is-dh_make-template
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
I: generic-dh-make-2008: extended-description-is-probably-too-short
I: generic-dh-make-2008: package-contains-empty-directory usr/bin/
I: generic-dh-make-2008: package-contains-empty-directory usr/sbin/
diff --git a/testset/copyright/debian/copyright.no-errors b/testset/copyright/debian/copyright.no-errors
index ac71512..071e0f3 100644
--- a/testset/copyright/debian/copyright.no-errors
+++ b/testset/copyright/debian/copyright.no-errors
@@ -32,5 +32,5 @@ License:
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
-The Debian packaging is (C) 2008, Tobias Toedter <t.toedter@gmx.net> and
-is licensed under the GPL, see above.
+The Debian packaging is Copyright 2008, Tobias Toedter <t.toedter@gmx.net>
+and is licensed under the GPL, see above.
--
Debian package checker
Reply to: