[SCM] Debian package checker branch, master, updated. 2.5.13-17-g9f63b6a
The following commit has been merged in the master branch:
commit 9f63b6a6701e0b77bd5ccfcdb5860d7c98e7c4b3
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Tue Jun 4 14:41:58 2013 +0200
Add false positive due to variant of formulation
Avoid a false positive
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index d3a7986..0ca602d 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -517,6 +517,15 @@ sub find_cruft {
/xismo) {
# no invariant libnss-pgsql version
}
+ when(m/(?: [,\.;] $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*)?
+ with $s+ no $s+ invariants? $s+ sections?
+ (?: [,\.;] $s*)? \Z
+ /xismo) {
+ # no invariant lilypond version
+ }
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
diff --git a/debian/changelog b/debian/changelog
index c9edaad..f962652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ lintian (2.5.14) UNRELEASED; urgency=low
* checks/cruft:
+ [NT] Revise a few tests that relied on file(1) on text files.
+ + [NT] Apply patches from Bastien Roucariès to fix some false
+ positives in the GDFL related checks. (Closes: #711119)
* checks/fields.desc:
+ [NT] Fix typo, thanks to Adrien Cunin.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/lilypond.texi b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/lilypond.texi
new file mode 100644
index 0000000..56939ee
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/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''.
--
Debian package checker
Reply to: