Author: adsb
Date: 2009-02-11 23:09:18 +0000 (Wed, 11 Feb 2009)
New Revision: 1816
Modified:
trunk/debian/changelog
trunk/scripts/licensecheck.pl
Log:
Add support for the Boost, Python and zlib/libpng licenses. Thanks,
Cristian Greco. (Closes: #514812)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-02-11 23:06:04 UTC (rev 1815)
+++ trunk/debian/changelog 2009-02-11 23:09:18 UTC (rev 1816)
@@ -22,6 +22,8 @@
default list of files to process. (Closes: #513770, #514337)
+ Fix a bug in a regular expression which meant that .h files weren't
included in the default list of files to search.
+ + Add support for the Boost, Python and zlib/libpng licenses. Thanks,
+ Cristian Greco. (Closes: #514812)
* README.newscripts: Correct the "svn propset" syntax added in the previous
upload.
Modified: trunk/scripts/licensecheck.pl
===================================================================
--- trunk/scripts/licensecheck.pl 2009-02-11 23:06:04 UTC (rev 1815)
+++ trunk/scripts/licensecheck.pl 2009-02-11 23:09:18 UTC (rev 1816)
@@ -490,6 +490,20 @@
$license = "CDDL " . ($1 ? "(v$2) " : '') . $license;
}
+ if ($licensetext =~ /Permission is hereby granted, free of charge, to any
person or organization obtaining a copy of the software and accompanying
documentation covered by this license \(the \"Software\"\)/ or
+ $licensetext =~ /Boost Software License([ ,-]+Version ([^ ]+)?(\.))/i) {
+ $license = "BSL " . ($1 ? "(v$2) " : '') . $license;
+ }
+
+ if ($licensetext =~ /PYTHON SOFTWARE FOUNDATION LICENSE (VERSION ([^
]+))/i) {
+ $license = "PSF " . ($1 ? "(v$2) " : '') . $license;
+ }
+
+ if ($licensetext =~ /The origin of this software must not be
misrepresented.*Altered source versions must be plainly marked as such.*This
notice may not be removed or altered from any source distribution/ or
+ $licensetext =~ /see copyright notice in zlib\.h/) {
+ $license = "zlib/libpng $license";
+ }
+
$license = "UNKNOWN" if (!length($license));
return $license;
--
To unsubscribe, send mail to [email protected].
