Merge branch 'master' of ssh://git.debian.org/git/dbnpolicy/policy

diff --git a/tools/license-count b/tools/license-count
index f895da95dfaf6f211e5802871402b516af4c225d..a45d9003cb1dd0b5df4e7e4f208c5d52e48df865 100755 (executable)
--- a/tools/license-count
+++ b/tools/license-count
@@ -32,12 +32,21 @@ our @RULES = (
     [qr,(?m)^License:.*AGPL-3,                     => 'AGPL 3'],
     [qr,(?m)^License:.*Artistic(?!-),              => 'Artistic'],
     [qr,(?m)^License:.*Artistic-2,                 => 'Artistic 2.0'],
+    [qr,(?m)^License:.*CC-BY-1.0,                  => 'CC-BY 1.0'],
+    [qr,(?m)^License:.*CC-BY-SA-1.0,               => 'CC-BY-SA 1.0'],
+    [qr,(?m)^License:.*CC-BY-2.0,                  => 'CC-BY 2.0'],
+    [qr,(?m)^License:.*CC-BY-SA-2.0,               => 'CC-BY-SA 2.0'],
+    [qr,(?m)^License:.*CC-BY-2.5,                  => 'CC-BY 2.5'],
+    [qr,(?m)^License:.*CC-BY-SA-2.5,               => 'CC-BY-SA 2.5'],
     [qr,(?m)^License:.*CC-BY-3.0,                  => 'CC-BY 3.0'],
     [qr,(?m)^License:.*CC-BY-SA-3.0,               => 'CC-BY-SA 3.0'],
+    [qr,(?m)^License:.*CC-BY-4.0,                  => 'CC-BY 4.0'],
+    [qr,(?m)^License:.*CC-BY-SA-4.0,               => 'CC-BY-SA 4.0'],
     [qr,(?m)^License:.*CDDL,                       => 'CDDL'],
     [qr,(?m)^License:.*GPL-1,                      => 'GPL 1'],
     [qr,(?m)^License:.*LPPL,                       => 'LaTeX PPL'],
     [qr,(?m)^License:.*MPL-1\.1,                   => 'MPL 1.1'],
+    [qr,(?m)^License:.*MPL-2\.0,                   => 'MPL 2.0'],
     [qr,(?m)^License:.*Perl,                       => 'Artistic'],
     [qr,(?m)^License:.*Perl,                       => 'GPL 1'],
 
@@ -50,13 +59,22 @@ our @RULES = (
     [qr,CeCILL-B FREE SOFTWARE LICENSE AGREEMENT,  => 'CeCILL-B'],
     [qr,CONTRAT DE LICENCE DE LOGICIEL LIBRE CeCILL-C, => 'CeCILL-C'],
     [qr,CeCILL-C FREE SOFTWARE LICENSE AGREEMENT,  => 'CeCILL-C'],
+    [qr,(?i)creative\s+commons\s+attribution\s+1\.0, => 'CC-BY 1.0'],
+    [qr,(?i)creative\s+commons\s+attribution[-\s]+share\s*alike\s+1\.0, => 'CC-BY-SA 1.0'],
+    [qr,(?i)creative\s+commons\s+attribution\s+2\.0, => 'CC-BY 2.0'],
+    [qr,(?i)creative\s+commons\s+attribution[-\s]+share\s*alike\s+2\.0, => 'CC-BY-SA 2.0'],
+    [qr,(?i)creative\s+commons\s+attribution\s+2\.5, => 'CC-BY 2.5'],
+    [qr,(?i)creative\s+commons\s+attribution[-\s]+share\s*alike\s+2\.5, => 'CC-BY-SA 2.5'],
     [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,(?i)creative\s+commons\s+attribution\s+4\.0, => 'CC-BY 4.0'],
+    [qr,(?i)creative\s+commons\s+attribution[-\s]+share\s*alike\s+4\.0, => 'CC-BY-SA 4.0'],
     [qr,GNU GENERAL PUBLIC LICENSE\s+Version 1,    => 'GPL 1'],
     [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,Mozilla Public License Version 2\.0,       => 'MPL 2.0'],
     [qr,SIL OPEN FONT LICENSE Version 1\.1,        => 'SIL OFL 1.1'],
     [qr,SIL OPEN FONT LICENSE Version 1\.0,        => 'SIL OFL 1.0'],
 );