X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fclscan%2Fclscan;h=8aac53bec50c86c4c2892002d1863468f9c6cd53;hb=c5b7e61819e07f8218a41824a0ea8081171e5afe;hp=9d6c23b448b886a83446cecd534cffa4aacc3342;hpb=825d4b05a9f432fa39078a91b24d05da759a5ad6;p=gnulib.git

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");
     }
 }