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

[SCM] Debian package checker branch, master, updated. 2.5.13-17-g9f63b6a



The following commit has been merged in the master branch:
commit 5eaf17b02ba2923446f17bb486f6652f0b4d65b5
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date:   Tue Jun 4 09:27:25 2013 +0200

    Fix a false positive in maintain.texi
    
    Maitain.texi and associated file aka html/maitain/section/ have a false positive due to an example.
    
    Allow:
    Following is an example of the license notice to use after the copyright line(s)
    using all the features of the GFDL.
    @smallexample
    Permission is granted to copy, distribute and
    ...
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/cruft b/checks/cruft
index 27b85db..d3a7986 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -492,6 +492,7 @@ sub find_cruft {
                           <br\s*/?>       |  # (X)HTML line breaks
                           </?link.*?>     |  # xml link
                           </?a.*?>        |  # a link
+                          </?p.*?>        |  # html link
                           \(\*note.*?::\) |  # info file note
                         )}xiso;
                         # GFDL license, assume it is bad unless it
@@ -542,6 +543,18 @@ sub find_cruft {
                                     $licenseproblemhash{'gfdl-invariants'} = 1;
                                 }
                             }
+                            # fix a false positive in maintain.texi
+                            when(m/\A $s* \. $s*
+                                   Following $s+ is $s+ an $s+ example $s+ of $s+ the $s+ license $s+ notice $s+
+                                   to $s+ use $s+ after $s+ the $s+ copyright $s+ line\(s\) $s+ using $s+ all $s+ the $s+
+                                   features $s+ of $s+ the $s+ GFDL/xismo)
+                            {
+                                # allow only one text
+                                unless($name =~ m/maintain/) {
+                                    tag 'license-problem-gfdl-invariants', $name;
+                                    $licenseproblemhash{'gfdl-invariants'} = 1;
+                                }
+                            }
                             default {
                                 tag 'license-problem-gfdl-invariants', $name;
                                 $licenseproblemhash{'gfdl-invariants'} = 1;
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/maintain.texi b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/maintain.texi
new file mode 100644
index 0000000..633e758
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/maintain.texi
@@ -0,0 +1,13 @@
+Documentation files should have license notices also.  Manuals should
+use the GNU Free Documentation License.  Following is an example of the
+license notice to use after the copyright line(s) using all the
+features of the GFDL.
+
+@smallexample
+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 ``GNU General Public License'', with the
+Front-Cover Texts being ``A GNU Manual'', and with the Back-Cover Texts
+as in (a) below.  A copy of the license is included in the section
+entitled ``GNU Free Documentation License''.

-- 
Debian package checker


Reply to: