Some additional fixes to the license classification script

Add counts for any version of the GFDL, GPL, or LGPL.  Clarify which
version of the LaTeX PPL this is checking.  Add a total package count
to the bottom.

diff --git a/tools/license-count b/tools/license-count
index 1a52f503cb34ca722aa9746ce0de09639af726e5..b8f14f27ee54c5535c250237048d7ab4cac05a60 100755 (executable)
--- a/tools/license-count
+++ b/tools/license-count
@@ -23,6 +23,10 @@ our @RULES = (
     [qr,/usr/share/common-licenses/GPL(?!-),       => 'GPL (symlink)'],
     [qr,/usr/share/common-licenses/LGPL(?!-),      => 'LGPL (symlink)'],
 
+    [qr,/usr/share/common-licenses/GFDL,           => 'GFDL (any)'],
+    [qr,/usr/share/common-licenses/GPL,            => 'GPL (any)'],
+    [qr,/usr/share/common-licenses/LGPL,           => 'LGPL (any)'],
+
     [qr,(?m)^License:.*Artistic(?!-),              => 'Artistic'],
     [qr,(?m)^License:.*Artistic-2,                 => 'Artistic 2.0'],
     [qr,(?m)^License:.*CC-BY-3.0,                  => 'CC-BY 3.0'],
@@ -45,7 +49,7 @@ 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'],
+    [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'],
@@ -85,3 +89,4 @@ for my $name (keys %counts) {
 for my $name (sort keys %counts) {
     printf "%-${length}s %5d\n", $name, $counts{$name};
 }
+print "\nTotal number of packages: $n\n";