[SCM] Debian package checker branch, master, updated. 2.5.11-150-g4936e00
The following commit has been merged in the master branch:
commit 5f64fbcb4f92a72520f949bef01772e8ce6646b0
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Thu Jan 24 09:59:46 2013 +0100
Detect empty gfdl statement about invariant sections
gfdl requests to explicitly mark that you have not invariant section
by writing text like this:
"with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts."
Some author instead use empty text. Detect this usage.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index e4ee299..ff66c67 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -472,6 +472,15 @@ sub find_cruft {
\s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)?/xis) {
# verbatim text of license is ok
}
+ when(m/\A \s* (?:(?:\,|\.|;)\s*)? version \s+ \d+(?:\.\d+)? \s+
+ (?:or \s+ any \s+ later \s+ version\s+)?
+ published \s+ by \s+ the \s+ Free \s+ Software \s+ Foundation \s*
+ (?:(?:\,|\.|;)\s*)? \z
+ /xis) {
+ # empty text is ambiguous
+ tag 'license-problem-gfdl-invariants-empty', $name;
+ $licenseproblemhash{'gfdl-invariants'} = 1;
+ }
default {
tag 'license-problem-gfdl-invariants', $name;
$licenseproblemhash{'gfdl-invariants'} = 1;
diff --git a/checks/cruft.desc b/checks/cruft.desc
index b184f9f..51035a2 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -497,3 +497,15 @@ Info: The given source file is licensed under GFDL with invariant
suitable for main.
Ref: http://wiki.debian.org/qa.debian.org/gfdlinvariant,
http://www.debian.org/vote/2006/vote_001
+
+Tag: license-problem-gfdl-invariants-empty
+Severity: minor
+Certainty: possible
+Info: The given source file is licensed under GFDL, but without any
+ precision about the presence of invariant sections, front-cover or
+ back-cover text.
+ .
+ GFDL license explicitly requests you to document this non presence.
+ .
+Ref: http://wiki.debian.org/qa.debian.org/gfdlinvariant,
+ http://www.debian.org/vote/2006/vote_001
diff --git a/debian/changelog b/debian/changelog
index 7ca032c..c8335ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ lintian (2.5.12) UNRELEASED; urgency=low
- illegal-runtime-test-name
- inconsistent-testsuite-field
- license-problem-gfdl-invariants
+ - license-problem-gfdl-invariants-empty
- menu-icon-uses-relative-path
- missing-runtime-test-file
- missing-runtime-tests-field
diff --git a/t/tests/cruft-gfdl-fp-sliding-win/debian/src/normal.texi b/t/tests/cruft-gfdl-invariants/debian/src/empty.texi
similarity index 65%
copy from t/tests/cruft-gfdl-fp-sliding-win/debian/src/normal.texi
copy to t/tests/cruft-gfdl-invariants/debian/src/empty.texi
index d9c1b54..8e87b5f 100644
--- a/t/tests/cruft-gfdl-fp-sliding-win/debian/src/normal.texi
+++ b/t/tests/cruft-gfdl-invariants/debian/src/empty.texi
@@ -1,6 +1,5 @@
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
version 1.3 or any later version published by the Free Software
-Foundation; with no Invariant Sections, no Front-Cover Texts and
-no Back-Cover Texts. A copy of the license is included in the
+Foundation. A copy of the license is included in the
section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-fp-sliding-win/debian/src/normal.texi b/t/tests/cruft-gfdl-invariants/debian/src/emptybis.texi
similarity index 65%
copy from t/tests/cruft-gfdl-fp-sliding-win/debian/src/normal.texi
copy to t/tests/cruft-gfdl-invariants/debian/src/emptybis.texi
index d9c1b54..7ad0640 100644
--- a/t/tests/cruft-gfdl-fp-sliding-win/debian/src/normal.texi
+++ b/t/tests/cruft-gfdl-invariants/debian/src/emptybis.texi
@@ -1,6 +1,7 @@
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Free Documentation License,
version 1.3 or any later version published by the Free Software
-Foundation; with no Invariant Sections, no Front-Cover Texts and
-no Back-Cover Texts. A copy of the license is included in the
+Foundation.
+
+A copy of the license is included in the
section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/desc b/t/tests/cruft-gfdl-invariants/desc
index 104ce2a..fcb9078 100644
--- a/t/tests/cruft-gfdl-invariants/desc
+++ b/t/tests/cruft-gfdl-invariants/desc
@@ -3,3 +3,4 @@ Sequence: 6000
Version: 1.0
Description: Check for GFDL invariants sections
Test-For: license-problem-gfdl-invariants
+ license-problem-gfdl-invariants-empty
diff --git a/t/tests/cruft-gfdl-invariants/tags b/t/tests/cruft-gfdl-invariants/tags
index dc071c3..51fa592 100644
--- a/t/tests/cruft-gfdl-invariants/tags
+++ b/t/tests/cruft-gfdl-invariants/tags
@@ -1,3 +1,5 @@
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
+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: