From c5b7e61819e07f8218a41824a0ea8081171e5afe Mon Sep 17 00:00:00 2001 From: Ian Beckwith Date: Tue, 15 Sep 2009 06:18:05 +0100 Subject: [PATCH] license_trailer: avoid bogus bare "GPL" matches --- debian/clscan/clscan | 17 ++++++++--------- debian/copyright | 17 +++++++---------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/debian/clscan/clscan b/debian/clscan/clscan index 9d6c23b44..8aac53bec 100755 --- a/debian/clscan/clscan +++ b/debian/clscan/clscan @@ -154,15 +154,14 @@ sub license_trailer }; my %types_found=(); -TYPE: for my $type (reverse sort keys(%$license_data)) + for my $type (reverse sort keys(%$license_data)) { for my $license (@licenses_used) { - if($license =~ /$type(\+|\b)/i) + if($license =~ /$type(\+|\s|$)/i) { $types_found{$type}=1; - # avoid matching eg GPL-2 *and* GPL - next TYPE; + print "FOUND $type [$license]\n"; } } } @@ -179,10 +178,10 @@ TYPE: for my $type (reverse sort keys(%$license_data)) # more than one, use table. $text .= "The complete text of standard licenses referenced above\n"; $text .= "can be found in /usr/share/common-licenses/ as follows:\n\n"; - $text .= sprintf("%-70s %s\n", "LICENSE", "FILE"); + $text .= sprintf("%-60s %s\n", "LICENSE", "FILE"); for my $type (sort keys(%types_found)) { - $text .= sprintf("%-70s %s\n", $license_data->{$type}, $type); + $text .= sprintf("%-60s %s\n", $license_data->{$type}, $type); } } return $text; @@ -341,9 +340,9 @@ sub load_overrides find({ wanted => \&wanted_modules, no_chdir => 1}, "modules/"); for my $license (keys(%overrides)) { - print("License: $license\n"); - print("Files: \n\t"); - print(join("\n\t", @{$overrides{$license}}),"\n"); +# print("License: $license\n"); +# print("Files: \n\t"); +# print(join("\n\t", @{$overrides{$license}}),"\n"); } } diff --git a/debian/copyright b/debian/copyright index 144b58d82..ed8dd4ac0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3346,13 +3346,10 @@ License: other [REF14] The complete text of standard licenses referenced above can be found in /usr/share/common-licenses/ as follows: -LICENSE FILE -GNU Free Documentation License GFDL -GNU Free Documentation License Version 1.3 GFDL-1.3 -GNU General Public License GPL -GNU General Public License Version 2 GPL-2 -GNU General Public License Version 3 GPL-3 -GNU Lesser General Public License LGPL -GNU Library General Public License Version 2 LGPL-2 -GNU Lesser General Public License Version 2.1 LGPL-2.1 -GNU Lesser General Public License Version 3 LGPL-3 +LICENSE FILE +GNU Free Documentation License Version 1.3 GFDL-1.3 +GNU General Public License Version 2 GPL-2 +GNU General Public License Version 3 GPL-3 +GNU Library General Public License Version 2 LGPL-2 +GNU Lesser General Public License Version 2.1 LGPL-2.1 +GNU Lesser General Public License Version 3 LGPL-3 -- 2.11.0