[SCM] Debian package checker branch, master, updated. 2.5.12-104-gc8d9f5a
The following commit has been merged in the master branch:
commit 315a14adee31348d0bbba8ef3c3332188d14c5f5
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Sun May 19 21:30:56 2013 +0200
Allow font change after GNU for matching the GFDL licence
gcc-4.7 man page include:
Permission is granted to copy, distribute and/or modify this document
under the terms of the \s-1GNU\s0 Free Documentation License, Version 1.2 or
any later version published by the Free Software Foundation; with the
Invariant Sections being \*(L"\s-1GNU\s0 General Public License\*(R" and \*(L"Funding
Free Software\*(R", the Front-Cover texts being (a) (see below), and with
the Back-Cover Texts being (b) (see below). A copy of the license is
included in the \fIgfdl\fR\|(7) man page.
Detect by allowing \s0 during matching of GNU Free Documentation License.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index d378988..19bd146 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -480,7 +480,7 @@ sub find_cruft {
# if the "redeeming" part is in the next block.
#
# See cruft-gfdl-fp-sliding-win for the test case
- when(m/GNU (?:\s+|\s*<\/span>\s*)? Free \s+ Documentation \s+ License (?'gfdlsections'.{0,1024})
+ when(m/GNU (?:\s+|\s*<\/span>\s*|\s*\\s\d\s*)? Free \s+ Documentation \s+ License (?'gfdlsections'.{0,1024})
A \s+ copy \s+ of \s+ the \s+ license \s+ is \s+ included/xis) {
if (!exists $licenseproblemhash{'gfdl-invariants'}) {
# local space
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldmanpagesgfdlproblem.1 b/t/tests/cruft-gfdl-invariants/debian/src/oldmanpagesgfdlproblem.1
new file mode 100644
index 0000000..83a4acf
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/oldmanpagesgfdlproblem.1
@@ -0,0 +1,12 @@
+.\"
+.\" Manpage example
+.\"
+.PP
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the \s-1GNU\s0 Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being \*(L"\s-1GNU\s0 General Public License\*(R" and \*(L"Funding
+Free Software\*(R", the Front-Cover texts being (a) (see below), and with
+the Back-Cover Texts being (b) (see below). A copy of the license is
+included in the \fIgfdl\fR\|(7) man page.
+.PP
diff --git a/t/tests/cruft-gfdl-invariants/tags b/t/tests/cruft-gfdl-invariants/tags
index 51fa592..85931f4 100644
--- a/t/tests/cruft-gfdl-invariants/tags
+++ b/t/tests/cruft-gfdl-invariants/tags
@@ -1,5 +1,6 @@
E: cruft-gfdl-invariants source: license-problem-gfdl-invariants src/frontback.html
E: cruft-gfdl-invariants source: license-problem-gfdl-invariants src/frontback.texi
E: cruft-gfdl-invariants source: license-problem-gfdl-invariants src/invariant.txt
+E: cruft-gfdl-invariants source: license-problem-gfdl-invariants src/oldmanpagesgfdlproblem.1
I: cruft-gfdl-invariants source: license-problem-gfdl-invariants-empty src/empty.texi
I: cruft-gfdl-invariants source: license-problem-gfdl-invariants-empty src/emptybis.texi
--
Debian package checker
Reply to: