Re: [SCM] Debian package checker branch, master, updated. 2.5.12-104-gc8d9f5a

[Russ Allbery <rra@debian.org>]

"Niels Thykier" <niels@thykier.net> writes:

> The following commit has been merged in the master branch:
> commit 315a14adee31348d0bbba8ef3c3332188d14c5f5
> Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
> Date:   Sun May 19 21:30:56 2013 +0200

>     Allow font change after GNU for matching the GFDL licence

[...]

> diff --git a/checks/cruft b/checks/cruft
> index d378988..19bd146 100644
> --- a/checks/cruft
> +++ b/checks/cruft
> @@ -480,7 +480,7 @@ sub find_cruft {
>                  # if the "redeeming" part is in the next block.
>                  #
>                  # See cruft-gfdl-fp-sliding-win for the test case
> -                when(m/GNU (?:\s+|\s*<\/span>\s*)? Free \s+ Documentation \s+ License (?'gfdlsections'.{0,1024})
> +                when(m/GNU (?:\s+|\s*<\/span>\s*|\s*\\s\d\s*)? Free \s+ Documentation \s+ License (?'gfdlsections'.{0,1024})
>                           A \s+ copy \s+ of \s+ the \s+ license \s+ is \s+ included/xis) {
>                      if (!exists $licenseproblemhash{'gfdl-invariants'}) {
>                          # local space

You may want to just clean pod2man formatting out of $block in advance of
doing any of the license comparisons.  That will be more robust against
any future license that we want to match inside man pages.

In some similar code I use locally, I do:

    # Clean up a bunch of formatting added by pod2man.
    $license =~ s/\\&//g;
    $license =~ s/\\s(?:-1|0)//g;
    $license =~ s/\\\*\([LR]\"/\"/g;

-- 
Russ Allbery (rra@debian.org)               <http://www.eyrie.org/~eagle/>