The following commit has been merged in the master branch:
commit d9850d3e60b0b805c4eaff2abc1535e1fce53a89
Author: Bastien ROUCARIÈS <[email protected]>
Date: Sat May 18 17:55:04 2013 +0200
Allow <br> and <br/> as space for gfdl license check
[nthykier:
* Merge 3 patches into one (0004, 0005 and 0007)
* Make the "/" optional, so the regex also works for HTML
]
Signed-off-by: Niels Thykier <[email protected]>
diff --git a/checks/cruft b/checks/cruft
index da69b35..dcbfbe0 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -484,7 +484,7 @@ sub find_cruft {
A \s+ copy \s+ of \s+ the \s+ license \s+ is \s+
included/xis) {
if (!exists $licenseproblemhash{'gfdl-invariants'}) {
# local space
- my $s = '(?:\s|\@c|%|\n[-\+!<>])';
+ my $s = '(?:\s|\@c|%|\n[-\+!<>]|<br\s*/?>)';
# GFDL license, assume it is bad unless it
# explicitly states it has no "bad sections".
given($+{gfdlsections}) {
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.html
b/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexamplesbr.html
similarity index 86%
copy from t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.html
copy to t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexamplesbr.html
index fffca61..46cbd2f 100644
--- a/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexample.html
+++ b/t/tests/cruft-gfdl-invariants/debian/src/gfdllicenseexamplesbr.html
@@ -6,7 +6,7 @@ Copyright (C) year your name.
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 Invariant Sections being <var>list their titles</var>, with
+with the<br/> Invariant Sections<br /> being <var>list their titles</var>, with
the Front-Cover Texts being <var>list</var>, and with the Back-Cover Texts
being <var>list</var>.
A copy of the license is included in the section entitled ``GNU Free
Documentation License''.
--
Debian package checker
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
