Author: rra
Date: 2008-01-03 02:37:35 +0100 (Thu, 03 Jan 2008)
New Revision: 1085
Modified:
trunk/checks/debian-readme
trunk/checks/debian-readme.desc
trunk/debian/changelog
trunk/testset/tags.dh-test
Log:
* checks/debian-readme{.desc,}:
+ Combine readme-debian-{is,contains}-debmake-template and be less
particular about the exact formatting of the dh-make template.
Triggering off the template text is enough and matches linda.
Thanks, Joerg Jaspert. (Closes: #458074)
Modified: trunk/checks/debian-readme
===================================================================
--- trunk/checks/debian-readme 2008-01-03 00:04:41 UTC (rev 1084)
+++ trunk/checks/debian-readme 2008-01-03 01:37:35 UTC (rev 1085)
@@ -38,16 +38,12 @@
close(IN);
}
-$template =
- ".* for DEBIAN\n" .
- "-+\n\n" .
- "(Comments regarding the Package|So far nothing to say\.|" .
- "<possible notes regarding this package - if none, delete this file>" .
- ")\n\n" .
- ".*<.*>,.*\n";
-if ($readme =~ m/$template/iom) {
- tag("readme-debian-is-debmake-template");
-} elsif ($readme =~ m/^So far nothing to say/m) {
+my @template =
+ ('Comments regarding the Package',
+ 'So far nothing to say',
+ '<possible notes regarding this package - if none, delete this file>');
+my $regex = join ('|', @template);
+if ($readme =~ m/$regex/io) {
tag("readme-debian-contains-debmake-template");
} elsif ($readme =~ m/^\s*-- [^<]*<[^> [EMAIL PROTECTED]>/m) {
tag("readme-debian-contains-debmake-default-email-address");
@@ -58,3 +54,9 @@
}
1;
+
+# Local Variables:
+# indent-tabs-mode: nil
+# cperl-indent-level: 4
+# End:
+# vim: syntax=perl sw=4 sts=4 ts=4 et shiftround
Modified: trunk/checks/debian-readme.desc
===================================================================
--- trunk/checks/debian-readme.desc 2008-01-03 00:04:41 UTC (rev 1084)
+++ trunk/checks/debian-readme.desc 2008-01-03 01:37:35 UTC (rev 1085)
@@ -4,20 +4,20 @@
Type: binary
Unpack-Level: 1
Needs-Info: debian-readme
-Info: This script looks at the README.Debian file installed by the
- package (if any) to see if it is the debmake template.
+Info: This script checks the README.Debian file for various problems.
-Tag: readme-debian-is-debmake-template
-Type: warning
-Info: The README.Debian file installed by this package is merely the
- template provided by deb-make or dh_make, and contains no information.
- If there is nothing useful to say there, then the file is best removed.
-
Tag: readme-debian-contains-debmake-template
Type: warning
-Info: The README.Debian file installed by this package contains the
- deb-make default phrase "So far nothing to say". If there is nothing
- to say in the file, then it is best removed.
+Info: The README.Debian file installed by this package contains one of the
+ template phrases from the README.Debian provided by deb-make or dh_make:
+ .
+ Comments regarding the package
+ So far nothing to say
+ <possible notes regarding this package - if none, delete this file>
+ .
+ If there is real information in the file, please delete any generic
+ template phrases. If there is nothing to say in the file, it is best
+ removed.
Tag: readme-debian-contains-debmake-default-email-address
Type: warning
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-01-03 00:04:41 UTC (rev 1084)
+++ trunk/debian/changelog 2008-01-03 01:37:35 UTC (rev 1085)
@@ -2,6 +2,11 @@
* checks/control-file{.desc,}:
+ [RA] Include the package name in stronger-dependency-implies-weaker.
+ * checks/debian-readme{.desc,}:
+ + Combine readme-debian-{is,contains}-debmake-template and be less
+ particular about the exact formatting of the dh-make template.
+ Triggering off the template text is enough and matches linda.
+ Thanks, Joerg Jaspert. (Closes: #458074)
* debian/control:
+ [RA] Suggest libtext-template-perl, needed for HTML reporting.
Modified: trunk/testset/tags.dh-test
===================================================================
--- trunk/testset/tags.dh-test 2008-01-03 00:04:41 UTC (rev 1084)
+++ trunk/testset/tags.dh-test 2008-01-03 01:37:35 UTC (rev 1085)
@@ -9,5 +9,5 @@
W: dh-test source: out-of-date-standards-version 3.6.2 (current is 3.7.3)
W: dh-test source: package-uses-deprecated-debhelper-compat-version 3
W: dh-test: new-package-should-close-itp-bug
-W: dh-test: readme-debian-is-debmake-template
+W: dh-test: readme-debian-contains-debmake-template
W: dh-test: wrong-bug-number-in-closes l3:#nnnn
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
