The following commit has been merged in the master branch:
commit 24669917d418917c845838806c300216e41981f3
Author: Pawel Hajdan, Jr <[email protected]>
Date:   Thu Nov 3 16:48:43 2011 +0100

    Recognize Microsoft Permissive License (Ms-PL)
    
    Note that according to FSF this is a free software license,
    just incompatible with GPL: 
http://www.gnu.org/licenses/license-list.html#ms-pl
    
    It's also OSI-approved: http://www.opensource.org/licenses/alphabetical
    
    Signed-off-by: Pawel Hajdan, Jr <[email protected]>
    Signed-off-by: James McCoy <[email protected]>

diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 4266296..2df7d80 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -505,6 +505,10 @@ sub parselicense($) {
        $license = "CDDL " . ($1 ? "(v$2) " : '') . $license;
     }
 
+    if ($licensetext =~ /Microsoft Permissive License \(Ms-PL\)/) {
+        $license = "Ms-PL $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;

-- 
Git repository for devscripts


-- 
To unsubscribe, send mail to [email protected].

Reply via email to