[SCM] Debian package checker branch, master, updated. 2.5.12-94-gf9f1b3e

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 02dfa8a5a068c841b134d63dbab8fceb2ffb9d49
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date:   Sun May 19 10:40:15 2013 +0200

    Be more liberal about gfdl on linking words
    
    And, with etc on the no invariants section could be ommited by upstream.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/cruft b/checks/cruft
index dcbfbe0..af5a0bb 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -488,9 +488,9 @@ sub find_cruft {
                         # GFDL license, assume it is bad unless it
                         # explicitly states it has no "bad sections".
                         given($+{gfdlsections}) {
-                            when(m/with $s+ (?:the$s+)? no $s+ Invariant $s+ Sections?,?
-                                        $s+ (?:with$s+)? (?:the$s+)? no $s+ Front-Cover $s+ Texts?,? $s+ and
-                                        $s+ (?:with$s+)? (?:the$s+)? no $s+ Back-Cover $s+ Texts?/xiso) {
+                            when(m/(?:the$s+)? no $s+ Invariant $s+ Sections?,?
+                                    $s+ (?:with$s+)? (?:the$s+)? no $s+ Front-Cover $s+ Texts?,? $s+ (?:and$s+)?
+                                        (?:with$s+)? (?:the$s+)? no $s+ Back-Cover $s+ Texts?/xiso) {
                                 # no invariant
                             }
                             when(m/with $s+ the $s+ Invariant $s+ Sections $s+ being
diff --git a/t/tests/cruft-gfdl-fp-sliding-win/debian/src/normal.texi b/t/tests/cruft-gfdl-invariants/debian/src/normalbkchem.texi
similarity index 82%
copy from t/tests/cruft-gfdl-fp-sliding-win/debian/src/normal.texi
copy to t/tests/cruft-gfdl-invariants/debian/src/normalbkchem.texi
index d9c1b54..dd888e2 100644
--- a/t/tests/cruft-gfdl-fp-sliding-win/debian/src/normal.texi
+++ b/t/tests/cruft-gfdl-invariants/debian/src/normalbkchem.texi
@@ -1,6 +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
+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".

-- 
Debian package checker