Author: adsb
Date: 2009-01-03 13:38:59 +0000 (Sat, 03 Jan 2009)
New Revision: 1776
Modified:
trunk/debian/changelog
trunk/scripts/licensecheck.pl
Log:
* licensecheck:
+ Detect the CDDL license. Thanks to Mike Hommey for the patch.
(Closes: #510574)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-01-02 19:13:07 UTC (rev 1775)
+++ trunk/debian/changelog 2009-01-03 13:38:59 UTC (rev 1776)
@@ -23,8 +23,11 @@
+ Mention --{no-,}diffstat in the help message.
+ Don't treat "DEBDIFF_SHOW_DIFFSTAT=no" as a modification from default
settings.
- * licensecheck: Add .cs (C# source files) to the default list of files to
- check. (Closes: #508163)
+ * licensecheck:
+ + Add .cs (C# source files) to the default list of files to check.
+ (Closes: #508163)
+ + Detect the CDDL license. Thanks to Mike Hommey for the patch.
+ (Closes: #510574)
* uscan: Improve parsing of non-HTMLised FTP directory listings so that
"foobar.tar.gz" doesn't match a request for "bar.tar.gz".
* conf.default.in:
Modified: trunk/scripts/licensecheck.pl
===================================================================
--- trunk/scripts/licensecheck.pl 2009-01-02 19:13:07 UTC (rev 1775)
+++ trunk/scripts/licensecheck.pl 2009-01-03 13:38:59 UTC (rev 1776)
@@ -478,6 +478,10 @@
$license = "Public domain";
}
+ if ($licensetext =~ /terms of the Common Development and Distribution
License(, Version ([^(]+))? \(the License\)/) {
+ $license = "CDDL " . ($1 ? "(v$2) " : '') . $license;
+ }
+
$license = "UNKNOWN" if (!length($license));
return $license;
--
To unsubscribe, send mail to [email protected].
