On 2013-02-17 18:34, Benjamin Drung wrote: > The following commit has been merged in the master branch: > commit 9c50b743db7701558f11f04b72851462575c824f > Author: Benjamin Drung <[email protected]> > Date: Sun Feb 17 18:33:24 2013 +0100 > > licensecheck: detect (L)GPL licenses more permissively. > > Thanks: Laurent Rineau > Closes: #659231 > > diff --git a/debian/changelog b/debian/changelog > index d7bb513..c5c3596 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -48,6 +48,8 @@ devscripts (2.13.0) UNRELEASED; urgency=low > * wrap-and-sort: > + Put special entries (variables and placeholders) at the end of the > list. > + Sort debian/control*.in files too. > + * licensecheck: detect (L)GPL licenses more permissively. Thanks to > + Laurent Rineau for the patch. (Closes: #659231) > > [ Cyril Brulebois ] > * Don't auto reverse diffs when DEBDIFF_AUTO_VER_SORT is set to yes, and > diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl > index 2758031..1a209e7 100755 > --- a/scripts/licensecheck.pl > +++ b/scripts/licensecheck.pl > @@ -450,7 +450,7 @@ sub parselicense { > $license = "GENERATED FILE"; > } > > - if ($licensetext =~ /is (free software.? you can redistribute it and\/or > modify it|licensed) under the terms of (version [^ ]+ of )?the (GNU (Library > |Lesser )General Public License|LGPL)/i) { > + if ($licensetext =~ /((is free software.? )?[Yy]ou can redistribute it > and\/or modify it|is licensed) under the terms of (version [^ ]+ of )?the > (GNU (Library |Lesser )General Public License|LGPL)/i) { ^^^^ > [...]
m//i already matches case-insensitively, so the [Yy] should be redundant AFAICT. ~Niels _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
