[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 a57830428443b94cf3a1fc70983cc1acb2e44f3e
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date:   Sat May 18 16:59:52 2013 +0200

    Be more liberal for zero is plural case for matching gfdl
    
    For non native english speaker zero could be singular. Avoid to
    trip lintian in the case of this grammar mistake.
    
    [nthykier: Merge of 0001 and 0006]
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/cruft b/checks/cruft
index ec079f9..dacc992 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/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) {
                                 # no invariant
                             }
                             when(m/with $s+ the $s+ Invariant $s+ Sections $s+ being
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/emptybis.texi b/t/tests/cruft-gfdl-invariants/debian/src/zeroisnotplural.texi
similarity index 69%
copy from t/tests/cruft-gfdl-invariants/debian/src/emptybis.texi
copy to t/tests/cruft-gfdl-invariants/debian/src/zeroisnotplural.texi
index 7ad0640..8782eed 100644
--- a/t/tests/cruft-gfdl-invariants/debian/src/emptybis.texi
+++ b/t/tests/cruft-gfdl-invariants/debian/src/zeroisnotplural.texi
@@ -1,7 +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.
-
-A copy of the license is included in the
+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".

-- 
Debian package checker