[SCM] Debian package checker branch, master, updated. 2.5.0-35-ged14452
The following commit has been merged in the master branch:
commit ed14452f24120d4676ec199ab15f1a8bfce9abc5
Author: Niels Thykier <niels@thykier.net>
Date: Sun Jan 16 20:58:44 2011 +0100
Extending the checks for dh_make templates
diff --git a/checks/copyright-file b/checks/copyright-file
index 300901b..d10fa80 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -270,7 +270,10 @@ if (m,(?:under )?(?:the )?(?:same )?(?:terms )?as Perl itself,i &&
if (m,\<put author[\'\(]s\)? name and email here\>,) {
tag 'helper-templates-in-copyright';
}
-if (m,\<Copyright \(C\) YYYY Name OfAuthor\>,) {
+if (m,\<Copyright \(C\) YYYY Name OfAuthor\>,o or
+ m,\<Copyright \(C\) \d{4} Upstream Full Name\>,o or
+ m,My Full Name \<name\@place.com\>,o or
+ m,\<likewise for another author\>,o) {
tag 'helper-templates-in-copyright';
}
@@ -278,7 +281,7 @@ if (m/This copyright info was automatically extracted/) {
tag 'copyright-contains-dh-make-perl-boilerplate';
}
-if (m,url://example\.com,) {
+if (m,url://example\.com, or m,url://somewhere\.com,) {
tag 'copyright-has-url-from-dh_make-boilerplate';
}
diff --git a/debian/changelog b/debian/changelog
index 3949e14..7555009 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,10 @@ lintian (2.5.1) UNRELEASED; urgency=low
* checks/debhelper{,.desc}:
+ [NT] Recognise that dh_python and dh_pycentral are now obsolete.
(Closes: #496902, #541978)
+ * checks/copyright-file:
+ + [NT] Extended current dh_make template checks. Thanks to
+ Nelson A. de Oliveira for the report and investigative work.
+ (Closes: #598412)
* checks/fields{,.desc}:
+ [NT] Allow "all" and "any" to appear together in the Architecture
field of a .dsc file. (Closes: #626775)
--
Debian package checker
Reply to: