Bug#717976: [new check] pedantic check for gfdl official wording about invariant
Package: lintian
Version: 2.5.13
Severity: wishlist
Tags: patch
Add a new tags for checking gfdl non official wording.
See tag description for reasons.
Bastien
From 14c7b6d5e93233241acf6a9ebff618320255bded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien@gmail.com>
Date: Sat, 27 Jul 2013 15:52:58 +0200
Subject: [PATCH] Warm about non official wording of gfdl
FSF fundation recommend a wording about gfdl with no invariant section.
Warm if upstream follow a dfsg compatible formulation but not endorsed by the FSF.
---
checks/cruft.desc | 21 ++++
checks/cruft.pm | 90 +++++++++++------
.../src/nonofficialwording/diveintopythonok.html | 12 +++
.../nonofficialwording/findsutilsokinlinenewline.c | 15 +++
.../debian/src/nonofficialwording/findutilsok.c | 15 +++
.../src/nonofficialwording/gfdltexcomments.tex | 7 ++
.../src/nonofficialwording/gnashfalsepositive.html | 15 +++
.../src/nonofficialwording/gnashfalsepositive.info | 14 +++
.../src/nonofficialwording/gnashfalsepositive.xml | 15 +++
.../hyphen-used-as-minus-sign.diff | 102 ++++++++++++++++++++
.../debian/src/nonofficialwording/libnss-pgsql.xml | 7 ++
.../debian/src/nonofficialwording/lilypond.texi | 6 ++
.../debian/src/nonofficialwording/mailutils.texi | 6 ++
.../debian/src/nonofficialwording/make-stds.texi | 7 ++
.../src/nonofficialwording/normalbkchem.texi | 6 ++
.../debian/src/nonofficialwording/parsewiki.txt | 4 +
.../src/nonofficialwording/partedvariant.txt | 8 ++
.../debian/src/nonofficialwording/patch-c0.diff | 18 ++++
.../src/nonofficialwording/variantdictfold.txt | 7 ++
.../src/nonofficialwording/zeroisnotplural.texi | 6 ++
.../src/oldfalsepositive/diveintopythonok.html | 12 ---
.../oldfalsepositive/findsutilsokinlinenewline.c | 15 ---
.../debian/src/oldfalsepositive/findutilsok.c | 15 ---
.../src/oldfalsepositive/gfdltexcomments.tex | 7 --
.../src/oldfalsepositive/gnashfalsepositive.html | 15 ---
.../src/oldfalsepositive/gnashfalsepositive.info | 14 ---
.../src/oldfalsepositive/gnashfalsepositive.xml | 15 ---
.../hyphen-used-as-minus-sign.diff | 102 --------------------
.../debian/src/oldfalsepositive/libnss-pgsql.xml | 7 --
.../debian/src/oldfalsepositive/lilypond.texi | 6 --
.../debian/src/oldfalsepositive/mailutils.texi | 6 --
.../debian/src/oldfalsepositive/make-stds.texi | 7 --
.../debian/src/oldfalsepositive/normalbkchem.texi | 6 --
.../debian/src/oldfalsepositive/parsewiki.txt | 4 -
.../debian/src/oldfalsepositive/partedvariant.txt | 8 --
.../debian/src/oldfalsepositive/patch-c0.diff | 18 ----
.../src/oldfalsepositive/variantdictfold.txt | 7 --
.../src/oldfalsepositive/zeroisnotplural.texi | 6 --
t/tests/cruft-gfdl-invariants/desc | 3 +
t/tests/cruft-gfdl-invariants/tags | 18 ++++
40 files changed, 372 insertions(+), 300 deletions(-)
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/diveintopythonok.html
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/findsutilsokinlinenewline.c
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/findutilsok.c
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gfdltexcomments.tex
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.html
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.info
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.xml
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/hyphen-used-as-minus-sign.diff
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/libnss-pgsql.xml
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/lilypond.texi
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/mailutils.texi
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/make-stds.texi
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/normalbkchem.texi
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/parsewiki.txt
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/partedvariant.txt
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/patch-c0.diff
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/variantdictfold.txt
create mode 100644 t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/zeroisnotplural.texi
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/diveintopythonok.html
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findsutilsokinlinenewline.c
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findutilsok.c
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gfdltexcomments.tex
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.html
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.info
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.xml
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/hyphen-used-as-minus-sign.diff
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/libnss-pgsql.xml
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/lilypond.texi
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/mailutils.texi
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/make-stds.texi
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/normalbkchem.texi
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/parsewiki.txt
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/partedvariant.txt
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/patch-c0.diff
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/variantdictfold.txt
delete mode 100644 t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/zeroisnotplural.texi
diff --git a/checks/cruft.desc b/checks/cruft.desc
index 184215f..5463206 100644
--- a/checks/cruft.desc
+++ b/checks/cruft.desc
@@ -510,6 +510,26 @@ Info: The given source file is licensed under GFDL, but without any
Ref: http://wiki.debian.org/qa.debian.org/gfdlinvariant,
http://www.debian.org/vote/2006/vote_001
+Tag: license-problem-gfdl-invariants-non-official
+Severity: pedantic
+Certainty: possible
+Info: The given source file is licensed under GFDL with no
+ invariant sections, front-cover or back-cover text.
+ But the license text is using a non official wording for
+ the non-invariant part, that is bad for avoiding license
+ proliferation and legal clarity. Please report upstream.
+ .
+ FSF text is:
+ 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
+ section entitled "GNU Free Documentation License".
+ .
+Ref: http://wiki.debian.org/qa.debian.org/gfdlinvariant,
+ http://www.debian.org/vote/2006/vote_001
+
Tag: source-contains-unsafe-symlink
Severity: serious
Certainty: possible
@@ -520,3 +540,4 @@ Info: The source contains an unsafe symlink. If followed, the link
.
If it is a part of the package's testsuite, Lintian may have failed
to recognise it as a test. In that case, please override the tag.
+
diff --git a/checks/cruft.pm b/checks/cruft.pm
index 004a84b..b882a67 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -502,15 +502,60 @@ sub find_cruft {
# GFDL license, assume it is bad unless it
# explicitly states it has no "bad sections".
given($+{gfdlsections}) {
+ # right answer
+ when(m/with $s+ no $s+ Invariant $s+ Sections $s* ,
+ $s+ no $s+ Front(?:\\?-)?$s*Cover $s+ Texts
+ $s+ and $s+ no $s+ Back(?:\\?-)?$s*Cover $s+ Texts/xiso) {
+ # Official wording by FSF
+ }
+ # false positive
+ when(m/with $s+ the $s+ Invariant $s+ Sections $s+ being
+ $s+ (?:\@var\{|<var>)? LIST $s+ THEIR $s+TITLES (?:\}|<\/var>)? $s* ,?
+ $s+ with $s+ the $s+ Front(?:[\\]?-)$s*Cover $s+ Texts $s+ being
+ $s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)? $s* ,?
+ $s+ and $s+ with $s+ the $s+ Back(?:[\\]?-)$s*Cover $s+ Texts $s+ being
+ $s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)?/xiso) {
+ # verbatim text of license is ok
+ }
+ # fix #708957 about FDL entities in template
+ when(m/with $s+ \&FDLInvariantSections;, $s+ with $s+ \&FDLFrontCoverText;,
+ $s+ and $s+ with $s+ \&FDLBackCoverText;/xiso)
+ {
+ unless($name =~ m/\/customization\/[\w-]+\/entities\/[\w-]+\.docbook$/) {
+ tag 'license-problem-gfdl-invariants', $name;
+ $licenseproblemhash{'gfdl-invariants'} = 1;
+ }
+ }
+ # fix a false positive in maintain.texi
+ when(m/\A $s* \. $s*
+ Following $s+ is $s+ an $s+ example $s+ of $s+ the $s+ license $s+ notice $s+
+ to $s+ use $s+ after $s+ the $s+ copyright $s+ line\(s\) $s+ using $s+ all $s+ the $s+
+ features $s+ of $s+ the $s+ GFDL/xismo)
+ {
+ # allow only one text
+ unless($name =~ m/maintain/) {
+ tag 'license-problem-gfdl-invariants', $name;
+ $licenseproblemhash{'gfdl-invariants'} = 1;
+ }
+ }
+ # Non official wording but dsfg compliant
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/xiso) {
- # no invariant
+ # no invariant with different mistakes
+ unless(exists($licenseproblemhash{'gfdl-invariants-non-official'})) {
+ tag 'license-problem-gfdl-invariants-non-official', $name;
+ $licenseproblemhash{'gfdl-invariants-non-official'} = 1;
+ }
}
when(m/no $s+ Invariant $s+ Sections?,?
$s+ (?:no$s+)? Front(?:[\\]?-)? $s+ or
$s+ (?:no$s+)? Back(?:[\\]?-)?$s*Cover $s+ Texts?/xiso) {
# no invariant variant (dict-foldoc)
+ unless(exists($licenseproblemhash{'gfdl-invariants-non-official'})) {
+ tag 'license-problem-gfdl-invariants-non-official', $name;
+ $licenseproblemhash{'gfdl-invariants-non-official'} = 1;
+ }
}
when(m/\A $s* (?: [\,\.;] $s* )? version $s+ \d+(?:\.\d+)? $s+
(?:or $s+ any $s+ later $s+ version $s+)?
@@ -520,6 +565,10 @@ sub find_cruft {
(?: [,\.;] $s*)? \Z
/xismo) {
# no invariant libnss-pgsql version
+ unless(exists($licenseproblemhash{'gfdl-invariants-non-official'})) {
+ tag 'license-problem-gfdl-invariants-non-official', $name;
+ $licenseproblemhash{'gfdl-invariants-non-official'} = 1;
+ }
}
when(m/\A $s* (?: [\,\.;] $s* )? version $s+ \d+(?:\.\d+)? $s+
(?:or $s+ any $s+ later $s+ version $s+)?
@@ -529,6 +578,10 @@ sub find_cruft {
(?: [,\.;] $s*)? \Z
/xismo) {
# no invariant parsewiki version
+ unless(exists($licenseproblemhash{'gfdl-invariants-non-official'})) {
+ tag 'license-problem-gfdl-invariants-non-official', $name;
+ $licenseproblemhash{'gfdl-invariants-non-official'} = 1;
+ }
}
when(m/(?: [,\.;] $s*)? version $s+ \d+(?:\.\d+)? $s+
(?:or $s+ any $s+ later $s+ version $s+)?
@@ -538,15 +591,12 @@ sub find_cruft {
(?: [,\.;] $s*)? \Z
/xismo) {
# no invariant lilypond version
+ unless(exists($licenseproblemhash{'gfdl-invariants-non-official'})) {
+ tag 'license-problem-gfdl-invariants-non-official', $name;
+ $licenseproblemhash{'gfdl-invariants-non-official'} = 1;
+ }
}
- when(m/with $s+ the $s+ Invariant $s+ Sections $s+ being
- $s+ (?:\@var\{|<var>)? LIST $s+ THEIR $s+TITLES (?:\}|<\/var>)? $s* ,?
- $s+ with $s+ the $s+ Front(?:[\\]?-)$s*Cover $s+ Texts $s+ being
- $s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)? $s* ,?
- $s+ and $s+ with $s+ the $s+ Back(?:[\\]?-)$s*Cover $s+ Texts $s+ being
- $s+ (?:\@var\{|<var>)? LIST (?:\}|<\/var>)?/xiso) {
- # verbatim text of license is ok
- }
+ # No indication of invariants. Ambiguous
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*
@@ -556,27 +606,7 @@ sub find_cruft {
tag 'license-problem-gfdl-invariants-empty', $name;
$licenseproblemhash{'gfdl-invariants'} = 1;
}
- # fix #708957 about FDL entities in template
- when(m/with $s+ \&FDLInvariantSections;, $s+ with $s+ \&FDLFrontCoverText;,
- $s+ and $s+ with $s+ \&FDLBackCoverText;/xiso)
- {
- unless($name =~ m/\/customization\/[\w-]+\/entities\/[\w-]+\.docbook$/) {
- tag 'license-problem-gfdl-invariants', $name;
- $licenseproblemhash{'gfdl-invariants'} = 1;
- }
- }
- # fix a false positive in maintain.texi
- when(m/\A $s* \. $s*
- Following $s+ is $s+ an $s+ example $s+ of $s+ the $s+ license $s+ notice $s+
- to $s+ use $s+ after $s+ the $s+ copyright $s+ line\(s\) $s+ using $s+ all $s+ the $s+
- features $s+ of $s+ the $s+ GFDL/xismo)
- {
- # allow only one text
- unless($name =~ m/maintain/) {
- tag 'license-problem-gfdl-invariants', $name;
- $licenseproblemhash{'gfdl-invariants'} = 1;
- }
- }
+ # Bad case
default {
tag 'license-problem-gfdl-invariants', $name;
$licenseproblemhash{'gfdl-invariants'} = 1;
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/diveintopythonok.html b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/diveintopythonok.html
new file mode 100644
index 0000000..6ace5df
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/diveintopythonok.html
@@ -0,0 +1,12 @@
+<html>
+<!--- This is a old false positive -->
+<body>
+ <div class="legalnotice">
+ <p>Permission is granted to copy, distribute, and/or modify this document under the terms of the <span class="acronym">GNU</span> Free Documentation License, Version 1.1 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 <a href="../appendix/fdl.html" title="Appendix G. GNU Free Documentation License">Appendix G, <i>GNU Free Documentation License</i></a>.
+ </p>
+ <p>The example programs in this book are free software; you can redistribute and/or modify them under the terms of the <span class="application">Python</span> license as published by the <span class="application">Python</span> Software Foundation. A copy of the license is included in <a href="../appendix/license.html" title="Appendix H. Python license">Appendix H, <i>Python license</i></a>.
+ </p>
+ </div>
+</body>
+</html>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/findsutilsokinlinenewline.c b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/findsutilsokinlinenewline.c
new file mode 100644
index 0000000..5291fd3
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/findsutilsokinlinenewline.c
@@ -0,0 +1,15 @@
+/* false positive from some package */
+ static const char *copy_para[]=
+ {
+ "Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,"
+ ,"2007, 2009, 2010, 2011 Free Software Foundation, Inc."
+ ,""
+ ,"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\nSections, with no\nFront-Cover Texts,\nand with no Back-Cover"
+ ,"Texts. A copy of the license is included in the ``GNU Free"
+ ,"Documentation License'' file as part of this distribution."
+ ""
+ ,NULL
+ };
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/findutilsok.c b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/findutilsok.c
new file mode 100644
index 0000000..23aa0af
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/findutilsok.c
@@ -0,0 +1,15 @@
+/* false positive from findutils */
+ static const char *copy_para[]=
+ {
+ "Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,"
+ ,"2007, 2009, 2010, 2011 Free Software Foundation, Inc."
+ ,""
+ ,"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, with no Front-Cover Texts, and with no Back-Cover"
+ ,"Texts. A copy of the license is included in the ``GNU Free"
+ ,"Documentation License'' file as part of this distribution."
+ ""
+ ,NULL
+ };
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gfdltexcomments.tex b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gfdltexcomments.tex
new file mode 100644
index 0000000..00e496c
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gfdltexcomments.tex
@@ -0,0 +1,7 @@
+% 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 no
+% Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+% Texts. A copy of the license is included in the section entitled
+% ``GNU Free Documentation License.''
+%
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.html b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.html
new file mode 100644
index 0000000..f01cd4c
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.html
@@ -0,0 +1,15 @@
+<html>
+<body>
+<div class="blockquote"><blockquote class="blockquote"><p>
+ Copyright 2008, Free Software Foundation.
+ </p><p>
+ 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 no<a class="link" href="#fdl-invariant">Invariant Sections</link>, with no <a class="link" href="#fdl-cover-texts">Front-Cover Texts</link>,
+ and with no <a class="link" href="#fdl-cover-texts">Back-Cover
+ Texts</a>. A copy of the license is included in
+ the section entitled "GNU Free Documentation License".
+</p></blockquote></div>
+</body>
+</html>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.info b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.info
new file mode 100644
index 0000000..cc7a754
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/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".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.xml b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.xml
new file mode 100644
index 0000000..9e77873
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/gnashfalsepositive.xml
@@ -0,0 +1,15 @@
+<html>
+<body>
+<div class="blockquote"><blockquote class="blockquote"><p>
+ Copyright 2008, Free Software Foundation.
+ </p><p>
+ 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 no<link class="link" href="#fdl-invariant">Invariant Sections</link>, with no <link class="link" href="#fdl-cover-texts">Front-Cover Texts</link>,
+ and with no <link class="link" href="#fdl-cover-texts">Back-Cover
+ Texts</link>. A copy of the license is included in
+ the section entitled "GNU Free Documentation License".
+</p></blockquote></div>
+</body>
+</html>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/hyphen-used-as-minus-sign.diff b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/hyphen-used-as-minus-sign.diff
new file mode 100644
index 0000000..ae8c973
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/hyphen-used-as-minus-sign.diff
@@ -0,0 +1,102 @@
+Description: hyphen-used-as-minus-sign
+ This manual page seems to contain a hyphen where a minus sign was
+ intended.
+Author: Ruben Molina <rmolina@udea.edu.co>
+Forwarded: no
+Last-Update: 2011-06-25
+
+Index: kst-2.0.3/src/kst/kst.1.txt
+===================================================================
+--- kst-2.0.3.orig/src/kst/kst.1.txt
++++ kst-2.0.3/src/kst/kst.1.txt
+@@ -47,7 +47,7 @@ kst may be run entirely from within its
+ command line arguments are needed. kst has a powerful wizard for
+ easily setting up new plots.
+
+-In the second invocation, kst loads pre-saved plot specifications from the
++In the second invocation, kst loads pre\-saved plot specifications from the
+ file
+ .I kstfile
+ and optionally may override some of the settings in that file.
+@@ -64,7 +64,7 @@ plot all curves in separate plots
+ .TP
+ .B \-a\fR
+ average frames (simple mean) when plotting with
+-.B -s\fR.
++.B \-s\fR.
+ .TP
+ .B \-\-A4\fR
+ use A4 sized paper for printing. Requires
+@@ -90,7 +90,7 @@ and instead use
+ .B \-f\ STARTFRAME\fR
+ begin plotting at
+ .I STARTFRAME
+-frames into the data. Set to -1 to start at
++frames into the data. Set to \-1 to start at
+ .I NUMFRAMES
+ from the end of the data.
+ .TP
+@@ -112,7 +112,7 @@ use US Letter sized paper for printing.
+ .B \-n\ NUMFRAMES\fR
+ plot at most
+ .I NUMFRAMES
+-frames of data. Set to -1 to indicate all of the data.
++frames of data. Set to \-1 to indicate all of the data.
+ .TP
+ .B \-P\ PLOTNAME\fR
+ plot all plots in the plot named
+@@ -145,7 +145,7 @@ frames when plotting.
+ .B \-x\ FIELD\fR
+ use
+ .I FIELD
+-as the X-axis vector.
++as the X\-axis vector.
+ .TP
+ .B \-y\ FIELD\fR
+ plot
+@@ -158,30 +158,30 @@ plot
+ as an image.
+ .SH EXAMPLES
+ Plot all data in column 2 from data.dat.
+- kst data.dat -y 2
++ kst data.dat \-y 2
+
+ Same as above, except only read 20 lines, starting at line 10.
+- kst data.dat -f 10 -n 20 -y 2
++ kst data.dat \-f 10 \-n 20 \-y 2
+
+ also read col 1. One plot per curve.
+- kst data.dat -f 10 -n 20 -y 1 -y 2
++ kst data.dat \-f 10 \-n 20 \-y 1 \-y 2
+
+ Read col 1 from data2.dat and col 1 from data.dat
+- kst data.dat -f 10 -n 20 -y 2 data2.dat -y 1
++ kst data.dat \-f 10 \-n 20 \-y 2 data2.dat \-y 1
+
+ Same as above, except read 40 lines starting at 30 in data2.dat
+- kst data.dat -f 10 -n 20 -y 2 data2.dat -f 30 -n 40 -y 1
++ kst data.dat \-f 10 \-n 20 \-y 2 data2.dat \-f 30 \-n 40 \-y 1
+
+ Specify the X vector and error bars:
+ Plot x = col 1 and Y = col 2 and error flags = col 3 from data.dat
+- kst data.dat -x 1 -e 3 -y 2
++ kst data.dat \-x 1 \-e 3 \-y 2
+
+ Get the X vector from data1.dat, and the Y vector from data2.dat.
+- kst data1.dat -x 1 data2.dat -y 1
++ kst data1.dat \-x 1 data2.dat \-y 1
+
+ Placement:
+ Plot column 2 and column 3 in plot P1 and column 4 in plot P2
+- kst data.dat -P P1 -y 2 -y 3 -P P2 -y 4
++ kst data.dat \-P P1 \-y 2 \-y 3 \-P P2 \-y 4
+ .SH BUGS
+ Please report bugs to either the kst mailing list at
+ .I kst@kde.org
+@@ -198,6 +198,6 @@ Matthew Truch <matt@truch.net>
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2 or
+ any later version published by the Free Software Foundation; with no
++Invariant Sections, with no Front\-Cover Texts, and with no Back\-Cover
+ Texts. A copy of the license is included in the `COPYING.DOC' file
+ as part of the kst distribution.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/libnss-pgsql.xml b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/libnss-pgsql.xml
new file mode 100644
index 0000000..8a5eb6e
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/libnss-pgsql.xml
@@ -0,0 +1,7 @@
+ <para>
+ 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. There
+ are no invariant sections. A copy of the license is included in the
+ section entitled "GNU Free Documentation License".
+ </para>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/lilypond.texi b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/lilypond.texi
new file mode 100644
index 0000000..56939ee
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/lilypond.texi
@@ -0,0 +1,6 @@
+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 no Invariant Sections.
+A copy of the license is included in the section entitled ``GNU
+Free Documentation License''.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/mailutils.texi b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/mailutils.texi
new file mode 100644
index 0000000..dffaccc
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/mailutils.texi
@@ -0,0 +1,6 @@
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, no Front-Cover, and no Back-Cover texts.
+A copy of the license is included in the section entitled ``GNU Free
+Documentation License''.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/make-stds.texi b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/make-stds.texi
new file mode 100644
index 0000000..b5c2685
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/make-stds.texi
@@ -0,0 +1,7 @@
+@c Permission is granted to copy, distribute and/or modify this document
+@c under the terms of the GNU Free Documentation License, Version 1.1
+@c or any later version published by the Free Software Foundation;
+@c with no Invariant Sections, with no
+@c Front-Cover Texts, and with no Back-Cover Texts.
+@c A copy of the license is included in the section entitled ``GNU
+@c Free Documentation License''.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/normalbkchem.texi b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/normalbkchem.texi
new file mode 100644
index 0000000..dd888e2
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/normalbkchem.texi
@@ -0,0 +1,6 @@
+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; no Invariant Sections, no Front-Cover Texts,
+no Back-Cover Texts. A copy of the license is included in the
+section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/parsewiki.txt b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/parsewiki.txt
new file mode 100644
index 0000000..950d936
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/parsewiki.txt
@@ -0,0 +1,4 @@
+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; without any Invariant \
+Sections. A copy of the license is included in the file GFDL.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/partedvariant.txt b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/partedvariant.txt
new file mode 100644
index 0000000..96037ac
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/partedvariant.txt
@@ -0,0 +1,8 @@
+Parted 2.13 version with strange grammar.
+
+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 the no Invariant Sections, with the no Front-Cover Texts, and
+with no Back-Cover Texts. A copy of the license is included in the
+file, COPYING.DOC.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/patch-c0.diff b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/patch-c0.diff
new file mode 100644
index 0000000..600653e
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/patch-c0.diff
@@ -0,0 +1,18 @@
+*** make-stds.texi 2013-02-17 21:44:05.485250349 +0100
+--- normal.texi 2012-12-20 21:23:22.829397718 +0100
+***************
+*** 1,7 ****
+! @c Permission is granted to copy, distribute and/or modify this document
+! @c under the terms of the GNU Free Documentation License, Version 1.1
+! @c or any later version published by the Free Software Foundation;
+! @c with no Invariant Sections, with no
+! @c Front-Cover Texts, and with no Back-Cover Texts.
+! @c A copy of the license is included in the section entitled ``GNU
+! @c Free Documentation License''.
+--- 1,6 ----
+! 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
+! section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/variantdictfold.txt b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/variantdictfold.txt
new file mode 100644
index 0000000..8463a59
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/variantdictfold.txt
@@ -0,0 +1,7 @@
+This is ok
+ 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 no Invariant Sections, Front-
+ or Back-Cover Texts. A copy of the license is included in the
+ section entitled "{GNU Free Documentation License}".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/zeroisnotplural.texi b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/zeroisnotplural.texi
new file mode 100644
index 0000000..8782eed
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/nonofficialwording/zeroisnotplural.texi
@@ -0,0 +1,6 @@
+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 Section, no Front-Cover Text and
+no Back-Cover Text. A copy of the license is included in the
+section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/diveintopythonok.html b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/diveintopythonok.html
deleted file mode 100644
index 6ace5df..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/diveintopythonok.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<!--- This is a old false positive -->
-<body>
- <div class="legalnotice">
- <p>Permission is granted to copy, distribute, and/or modify this document under the terms of the <span class="acronym">GNU</span> Free Documentation License, Version 1.1 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 <a href="../appendix/fdl.html" title="Appendix G. GNU Free Documentation License">Appendix G, <i>GNU Free Documentation License</i></a>.
- </p>
- <p>The example programs in this book are free software; you can redistribute and/or modify them under the terms of the <span class="application">Python</span> license as published by the <span class="application">Python</span> Software Foundation. A copy of the license is included in <a href="../appendix/license.html" title="Appendix H. Python license">Appendix H, <i>Python license</i></a>.
- </p>
- </div>
-</body>
-</html>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findsutilsokinlinenewline.c b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findsutilsokinlinenewline.c
deleted file mode 100644
index 5291fd3..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findsutilsokinlinenewline.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* false positive from some package */
- static const char *copy_para[]=
- {
- "Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,"
- ,"2007, 2009, 2010, 2011 Free Software Foundation, Inc."
- ,""
- ,"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\nSections, with no\nFront-Cover Texts,\nand with no Back-Cover"
- ,"Texts. A copy of the license is included in the ``GNU Free"
- ,"Documentation License'' file as part of this distribution."
- ""
- ,NULL
- };
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findutilsok.c b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findutilsok.c
deleted file mode 100644
index 23aa0af..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/findutilsok.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* false positive from findutils */
- static const char *copy_para[]=
- {
- "Copyright (C) 1994, 1996, 1998, 2000, 2001, 2003, 2004, 2005, 2006,"
- ,"2007, 2009, 2010, 2011 Free Software Foundation, Inc."
- ,""
- ,"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, with no Front-Cover Texts, and with no Back-Cover"
- ,"Texts. A copy of the license is included in the ``GNU Free"
- ,"Documentation License'' file as part of this distribution."
- ""
- ,NULL
- };
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gfdltexcomments.tex b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gfdltexcomments.tex
deleted file mode 100644
index 00e496c..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gfdltexcomments.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-% 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 no
-% Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-% Texts. A copy of the license is included in the section entitled
-% ``GNU Free Documentation License.''
-%
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.html b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.html
deleted file mode 100644
index f01cd4c..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<body>
-<div class="blockquote"><blockquote class="blockquote"><p>
- Copyright 2008, Free Software Foundation.
- </p><p>
- 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 no<a class="link" href="#fdl-invariant">Invariant Sections</link>, with no <a class="link" href="#fdl-cover-texts">Front-Cover Texts</link>,
- and with no <a class="link" href="#fdl-cover-texts">Back-Cover
- Texts</a>. A copy of the license is included in
- the section entitled "GNU Free Documentation License".
-</p></blockquote></div>
-</body>
-</html>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.info b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.info
deleted file mode 100644
index cc7a754..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.info
+++ /dev/null
@@ -1,14 +0,0 @@
-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".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.xml b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.xml
deleted file mode 100644
index 9e77873..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/gnashfalsepositive.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<body>
-<div class="blockquote"><blockquote class="blockquote"><p>
- Copyright 2008, Free Software Foundation.
- </p><p>
- 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 no<link class="link" href="#fdl-invariant">Invariant Sections</link>, with no <link class="link" href="#fdl-cover-texts">Front-Cover Texts</link>,
- and with no <link class="link" href="#fdl-cover-texts">Back-Cover
- Texts</link>. A copy of the license is included in
- the section entitled "GNU Free Documentation License".
-</p></blockquote></div>
-</body>
-</html>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/hyphen-used-as-minus-sign.diff b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/hyphen-used-as-minus-sign.diff
deleted file mode 100644
index ae8c973..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/hyphen-used-as-minus-sign.diff
+++ /dev/null
@@ -1,102 +0,0 @@
-Description: hyphen-used-as-minus-sign
- This manual page seems to contain a hyphen where a minus sign was
- intended.
-Author: Ruben Molina <rmolina@udea.edu.co>
-Forwarded: no
-Last-Update: 2011-06-25
-
-Index: kst-2.0.3/src/kst/kst.1.txt
-===================================================================
---- kst-2.0.3.orig/src/kst/kst.1.txt
-+++ kst-2.0.3/src/kst/kst.1.txt
-@@ -47,7 +47,7 @@ kst may be run entirely from within its
- command line arguments are needed. kst has a powerful wizard for
- easily setting up new plots.
-
--In the second invocation, kst loads pre-saved plot specifications from the
-+In the second invocation, kst loads pre\-saved plot specifications from the
- file
- .I kstfile
- and optionally may override some of the settings in that file.
-@@ -64,7 +64,7 @@ plot all curves in separate plots
- .TP
- .B \-a\fR
- average frames (simple mean) when plotting with
--.B -s\fR.
-+.B \-s\fR.
- .TP
- .B \-\-A4\fR
- use A4 sized paper for printing. Requires
-@@ -90,7 +90,7 @@ and instead use
- .B \-f\ STARTFRAME\fR
- begin plotting at
- .I STARTFRAME
--frames into the data. Set to -1 to start at
-+frames into the data. Set to \-1 to start at
- .I NUMFRAMES
- from the end of the data.
- .TP
-@@ -112,7 +112,7 @@ use US Letter sized paper for printing.
- .B \-n\ NUMFRAMES\fR
- plot at most
- .I NUMFRAMES
--frames of data. Set to -1 to indicate all of the data.
-+frames of data. Set to \-1 to indicate all of the data.
- .TP
- .B \-P\ PLOTNAME\fR
- plot all plots in the plot named
-@@ -145,7 +145,7 @@ frames when plotting.
- .B \-x\ FIELD\fR
- use
- .I FIELD
--as the X-axis vector.
-+as the X\-axis vector.
- .TP
- .B \-y\ FIELD\fR
- plot
-@@ -158,30 +158,30 @@ plot
- as an image.
- .SH EXAMPLES
- Plot all data in column 2 from data.dat.
-- kst data.dat -y 2
-+ kst data.dat \-y 2
-
- Same as above, except only read 20 lines, starting at line 10.
-- kst data.dat -f 10 -n 20 -y 2
-+ kst data.dat \-f 10 \-n 20 \-y 2
-
- also read col 1. One plot per curve.
-- kst data.dat -f 10 -n 20 -y 1 -y 2
-+ kst data.dat \-f 10 \-n 20 \-y 1 \-y 2
-
- Read col 1 from data2.dat and col 1 from data.dat
-- kst data.dat -f 10 -n 20 -y 2 data2.dat -y 1
-+ kst data.dat \-f 10 \-n 20 \-y 2 data2.dat \-y 1
-
- Same as above, except read 40 lines starting at 30 in data2.dat
-- kst data.dat -f 10 -n 20 -y 2 data2.dat -f 30 -n 40 -y 1
-+ kst data.dat \-f 10 \-n 20 \-y 2 data2.dat \-f 30 \-n 40 \-y 1
-
- Specify the X vector and error bars:
- Plot x = col 1 and Y = col 2 and error flags = col 3 from data.dat
-- kst data.dat -x 1 -e 3 -y 2
-+ kst data.dat \-x 1 \-e 3 \-y 2
-
- Get the X vector from data1.dat, and the Y vector from data2.dat.
-- kst data1.dat -x 1 data2.dat -y 1
-+ kst data1.dat \-x 1 data2.dat \-y 1
-
- Placement:
- Plot column 2 and column 3 in plot P1 and column 4 in plot P2
-- kst data.dat -P P1 -y 2 -y 3 -P P2 -y 4
-+ kst data.dat \-P P1 \-y 2 \-y 3 \-P P2 \-y 4
- .SH BUGS
- Please report bugs to either the kst mailing list at
- .I kst@kde.org
-@@ -198,6 +198,6 @@ Matthew Truch <matt@truch.net>
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.2 or
- any later version published by the Free Software Foundation; with no
-+Invariant Sections, with no Front\-Cover Texts, and with no Back\-Cover
- Texts. A copy of the license is included in the `COPYING.DOC' file
- as part of the kst distribution.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/libnss-pgsql.xml b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/libnss-pgsql.xml
deleted file mode 100644
index 8a5eb6e..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/libnss-pgsql.xml
+++ /dev/null
@@ -1,7 +0,0 @@
- <para>
- 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. There
- are no invariant sections. A copy of the license is included in the
- section entitled "GNU Free Documentation License".
- </para>
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/lilypond.texi b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/lilypond.texi
deleted file mode 100644
index 56939ee..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/lilypond.texi
+++ /dev/null
@@ -1,6 +0,0 @@
-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 no Invariant Sections.
-A copy of the license is included in the section entitled ``GNU
-Free Documentation License''.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/mailutils.texi b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/mailutils.texi
deleted file mode 100644
index dffaccc..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/mailutils.texi
+++ /dev/null
@@ -1,6 +0,0 @@
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, no Front-Cover, and no Back-Cover texts.
-A copy of the license is included in the section entitled ``GNU Free
-Documentation License''.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/make-stds.texi b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/make-stds.texi
deleted file mode 100644
index b5c2685..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/make-stds.texi
+++ /dev/null
@@ -1,7 +0,0 @@
-@c Permission is granted to copy, distribute and/or modify this document
-@c under the terms of the GNU Free Documentation License, Version 1.1
-@c or any later version published by the Free Software Foundation;
-@c with no Invariant Sections, with no
-@c Front-Cover Texts, and with no Back-Cover Texts.
-@c A copy of the license is included in the section entitled ``GNU
-@c Free Documentation License''.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/normalbkchem.texi b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/normalbkchem.texi
deleted file mode 100644
index dd888e2..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/normalbkchem.texi
+++ /dev/null
@@ -1,6 +0,0 @@
-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; no Invariant Sections, no Front-Cover Texts,
-no Back-Cover Texts. A copy of the license is included in the
-section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/parsewiki.txt b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/parsewiki.txt
deleted file mode 100644
index 950d936..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/parsewiki.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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; without any Invariant \
-Sections. A copy of the license is included in the file GFDL.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/partedvariant.txt b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/partedvariant.txt
deleted file mode 100644
index 96037ac..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/partedvariant.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Parted 2.13 version with strange grammar.
-
-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 the no Invariant Sections, with the no Front-Cover Texts, and
-with no Back-Cover Texts. A copy of the license is included in the
-file, COPYING.DOC.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/patch-c0.diff b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/patch-c0.diff
deleted file mode 100644
index 600653e..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/patch-c0.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-*** make-stds.texi 2013-02-17 21:44:05.485250349 +0100
---- normal.texi 2012-12-20 21:23:22.829397718 +0100
-***************
-*** 1,7 ****
-! @c Permission is granted to copy, distribute and/or modify this document
-! @c under the terms of the GNU Free Documentation License, Version 1.1
-! @c or any later version published by the Free Software Foundation;
-! @c with no Invariant Sections, with no
-! @c Front-Cover Texts, and with no Back-Cover Texts.
-! @c A copy of the license is included in the section entitled ``GNU
-! @c Free Documentation License''.
---- 1,6 ----
-! 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
-! section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/variantdictfold.txt b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/variantdictfold.txt
deleted file mode 100644
index 8463a59..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/variantdictfold.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-This is ok
- 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 no Invariant Sections, Front-
- or Back-Cover Texts. A copy of the license is included in the
- section entitled "{GNU Free Documentation License}".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/zeroisnotplural.texi b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/zeroisnotplural.texi
deleted file mode 100644
index 8782eed..0000000
--- a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/zeroisnotplural.texi
+++ /dev/null
@@ -1,6 +0,0 @@
-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 Section, no Front-Cover Text and
-no Back-Cover Text. 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 fcb9078..45c435a 100644
--- a/t/tests/cruft-gfdl-invariants/desc
+++ b/t/tests/cruft-gfdl-invariants/desc
@@ -2,5 +2,8 @@ Testname: cruft-gfdl-invariants
Sequence: 6000
Version: 1.0
Description: Check for GFDL invariants sections
+Skeleton: pedantic
+Options: --pedantic -I -E
Test-For: license-problem-gfdl-invariants
license-problem-gfdl-invariants-empty
+ license-problem-gfdl-invariants-non-official
diff --git a/t/tests/cruft-gfdl-invariants/tags b/t/tests/cruft-gfdl-invariants/tags
index a4064fc..5d0557e 100644
--- a/t/tests/cruft-gfdl-invariants/tags
+++ b/t/tests/cruft-gfdl-invariants/tags
@@ -5,3 +5,21 @@ E: cruft-gfdl-invariants source: license-problem-gfdl-invariants src/invariant.t
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
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/diveintopythonok.html
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/findsutilsokinlinenewline.c
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/findutilsok.c
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/gfdltexcomments.tex
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/gnashfalsepositive.html
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/gnashfalsepositive.info
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/gnashfalsepositive.xml
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/hyphen-used-as-minus-sign.diff
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/libnss-pgsql.xml
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/lilypond.texi
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/mailutils.texi
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/make-stds.texi
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/normalbkchem.texi
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/parsewiki.txt
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/partedvariant.txt
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/patch-c0.diff
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/variantdictfold.txt
+P: cruft-gfdl-invariants source: license-problem-gfdl-invariants-non-official src/nonofficialwording/zeroisnotplural.texi
--
1.7.10.4
Reply to: