From: Russ Allbery Date: Thu, 10 Jun 2010 23:54:48 +0000 (-0700) Subject: Some additional tweaks to the license count script X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6eab91c6e1edb4fe5991ea89fc24369f45c36311;p=debian%2Fdebian-policy.git Some additional tweaks to the license count script Also look for LPPL version 1.3a and for any version of the license. Be case-insensitive when looking for the Artistic 2.0 license. --- diff --git a/tools/license-count b/tools/license-count index b8f14f2..97cde79 100755 --- a/tools/license-count +++ b/tools/license-count @@ -38,7 +38,7 @@ our @RULES = ( [qr,(?m)^License:.*Perl, => 'Artistic'], [qr,(?m)^License:.*Perl, => 'GPL 1'], - [qr,The Artistic License 2\.0, => 'Artistic 2.0'], + [qr,(?i)The Artistic License 2\.0, => 'Artistic 2.0'], [qr,COMMON DEVELOPMENT AND DISTRIBUTION LICENSE \(CDDL\), => 'CDDL'], [qr,CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL(?!-), => 'CeCILL'], [qr,CeCILL FREE SOFTWARE LICENSE AGREEMENT, => 'CeCILL'], @@ -49,7 +49,9 @@ our @RULES = ( [qr,(?i)creative\s+commons\s+attribution\s+3\.0, => 'CC-BY 3.0'], [qr,(?i)creative\s+commons\s+attribution[-\s]+share\s*alike\s+3\.0, => 'CC-BY-SA 3.0'], [qr,GNU GENERAL PUBLIC LICENSE\s+Version 1, => 'GPL 1'], - [qr,LPPL Version 1.3c, => 'LaTeX PPL 1.3c'], + [qr,LPPL Version, => 'LaTeX PPL (any)'], + [qr,LPPL Version 1\.3a, => 'LaTeX PPL 1.3a'], + [qr,LPPL Version 1\.3c, => 'LaTeX PPL 1.3c'], [qr,MOZILLA PUBLIC LICENSE\s+Version 1\.1, => 'MPL 1.1'], [qr,SIL OPEN FONT LICENSE Version 1\.1, => 'SIL OFL 1.1'], [qr,SIL OPEN FONT LICENSE Version 1\.0, => 'SIL OFL 1.0'],