[SCM] Debian package checker branch, master, updated. 2.5.12-104-gc8d9f5a
The following commit has been merged in the master branch:
commit ea1e3c0fce9ec07c10851b7cafa37c9a13957f17
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Sun May 19 22:08:15 2013 +0200
Allow (*note ) from info file
Some info file like gnash use note tag.
Allow it.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index ebc8588..7a0e5aa 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -485,21 +485,22 @@ sub find_cruft {
if (!exists $licenseproblemhash{'gfdl-invariants'}) {
# local space
my $s = qr{(?:
- \s | # regular space(s)
- \@c | # Tex info comment
- [%\*\"\|] | # String, C-style comment/javadoc indent, quotes for strings, pipe in some txt
- \"\s*, | # String array (e.g. "line1",\n"line2")
- ,\s*\" | # String array (e.g. "line1"\n ,"line2"), seen in findutils
- \\n | # Verbatim \n in string array
- \n[-\+!<>] | # diff/patch lines
- \n\.\\\" | # man comments
- <br\s*/?> # (X)HTML line breaks
+ \s | # regular space(s)
+ \@c | # Tex info comment
+ [%\*\"\|] | # String, C-style comment/javadoc indent, quotes for strings, pipe in some txt
+ \"\s*, | # String array (e.g. "line1",\n"line2")
+ ,\s*\" | # String array (e.g. "line1"\n ,"line2"), seen in findutils
+ \\n | # Verbatim \n in string array
+ \n[-\+!<>] | # diff/patch lines
+ \n\.\\\" | # man comments
+ <br\s*/?> | # (X)HTML line breaks
+ \(\*note.*?::\) | # info file note
)}xiso;
# GFDL license, assume it is bad unless it
# explicitly states it has no "bad sections".
given($+{gfdlsections}) {
- when(m/no $s+ Invariant $s+ Sections?,?
- $s+ (?:with$s+)? (?:the$s+)? no $s+ Front-$s*Cover $s+ Texts?,? $s+ (?:and$s+)?
+ when(m/no $s* Invariant $s+ Sections? $s* ,?
+ $s+ (?:with$s+)? (?:the$s+)? no $s+ Front-$s*Cover $s+ Texts? $s* ,? $s+ (?:and$s+)?
(?:with$s+)? (?:the$s+)? no $s+ Back-$s*Cover $s+ Texts?/xiso) {
# no invariant
}
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.info b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.info
new file mode 100644
index 0000000..cc7a754
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.info
@@ -0,0 +1,14 @@
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and license
+notices just after the title page:
+
+Copyright 2008, Free Software Foundation.
+
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+version 1.1 or any later version published by the Free Software
+Foundation; with noInvariant Sections (*note fdl-invariant::),
+with no Front-Cover Texts (*note fdl-cover-texts::), and with no
+Back-Cover Texts (*note fdl-cover-texts::). A copy of the license
+is included in the section entitled "GNU Free Documentation
+License".
--
Debian package checker
Reply to: