[SCM] Debian package checker branch, master, updated. 2.5.12-115-gd3e8fab
The following commit has been merged in the master branch:
commit d3e8fab9364411c724ac81d8df1f318beb961100
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Wed May 22 23:07:24 2013 +0200
c/cruft: Fix a GDFL false negative
Allow brace for texi around GNU like @acronym{GNU}
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index d67f8c5..fce4309 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*|\s*\\s\d\s*)? Free \s+ Documentation \s+ License (?'gfdlsections'.{0,1024})
+ when(m/GNU (?:\s+|\s*<\/span>\s*|\s*\\s\d\s*|\s*\}\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/debian/changelog b/debian/changelog
index 5c2ff38..df36922 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,8 +40,8 @@ lintian (2.5.13) UNRELEASED; urgency=low
the package root. Thanks to Michael Schutte for the
report and the patch. (Closes: #707742)
+ [NT] Add a series of patches from Bastien Roucariès to
- reduce the number of false positives in the GDFL related
- checks. (Closes: #708957, #708881)
+ reduce the number of false positives and negatives in the
+ GDFL related checks. (Closes: #708957, #708881, #709379)
* checks/debhelper{,.desc}:
+ [NT] Retire some tags that is no longer relevant in the
Jessie development cycle.
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/autoconf.texi b/t/tests/cruft-gfdl-invariants/debian/src/autoconf.texi
new file mode 100644
index 0000000..ba8175d
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/autoconf.texi
@@ -0,0 +1,12 @@
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the @acronym{GNU} Free Documentation License,
+Version 1.3 or any later version published by the Free Software
+Foundation; with no Invariant Sections, with the Front-Cover texts
+being ``A @acronym{GNU} Manual,'' and with the Back-Cover Texts as in
+(a) below. A copy of the license is included in the section entitled
+``@acronym{GNU} Free Documentation License.''
+
+(a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
+modify this @acronym{GNU} manual. Buying copies from the @acronym{FSF}
+supports it in developing @acronym{GNU} and promoting software
+freedom.''
diff --git a/t/tests/cruft-gfdl-invariants/tags b/t/tests/cruft-gfdl-invariants/tags
index 85931f4..a4064fc 100644
--- a/t/tests/cruft-gfdl-invariants/tags
+++ b/t/tests/cruft-gfdl-invariants/tags
@@ -1,3 +1,4 @@
+E: cruft-gfdl-invariants source: license-problem-gfdl-invariants src/autoconf.texi
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
--
Debian package checker
Reply to: