[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.13-30-g9f1bede



The following commit has been merged in the master branch:
commit e5a3659ddde4fbffc5c7f55791a9a62389816568
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date:   Sat Jun 15 17:11:34 2013 +0200

    Fix another false positive for gfdl variant
    
    Fix another false positive when front-cover text is abbreviated front-cover.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/cruft.pm b/checks/cruft.pm
index 12b2006..00ec871 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -500,8 +500,8 @@ sub find_cruft {
                         # explicitly states it has no "bad sections".
                         given($+{gfdlsections}) {
                             when(m/no $s* Invariant $s+ Sections? $s* ,?
-                                   $s+ (?:with$s+)? (?:the$s+)? no $s+ Front(?:\\?-)?$s*Cover $s+ Texts? $s* ,? $s+ (?:and$s+)?
-                                       (?:with$s+)? (?:the$s+)? no $s+ Back(?:\\?-)?$s*Cover $s+ Texts?/xiso) {
+                                   $s+ (?:with$s+)? (?:the$s+)? no $s+ Front(?:\\?-)?$s*Cover $s+ (?:Texts?)? $s* ,? $s+ (?:and$s+)?
+                                       (?:with$s+)? (?:the$s+)? no $s+ Back(?:\\?-)?$s*Cover/xiso) {
                                 # no invariant
                             }
                             when(m/no $s+ Invariant $s+ Sections?,?
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/mailutils.texi b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/mailutils.texi
new file mode 100644
index 0000000..dffaccc
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/mailutils.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.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, no Front-Cover, and no Back-Cover texts.
+A copy of the license is included in the section entitled ``GNU Free
+Documentation License''.

-- 
Debian package checker


Reply to: