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

    Recognize another variant of libpng license.
    
    This is a part of an effort to make Chromium project sources
    pass licensecheck: http://code.google.com/p/chromium/issues/detail?id=28291
    
    Signed-off-by: PaweÅ‚ Hajdan, Jr <[email protected]>
    Signed-off-by: James McCoy <[email protected]>

diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl
index 2df7d80..3a0634a 100755
--- a/scripts/licensecheck.pl
+++ b/scripts/licensecheck.pl
@@ -521,6 +521,8 @@ sub parselicense($) {
     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";
+    } elsif ($licensetext =~ /This code is released under the libpng license/) 
{
+        $license = "libpng $license";
     }
 
     if ($licensetext =~ /Do What The Fuck You Want To Public License, Version 
([^, ]+)/i) {

-- 
Git repository for devscripts


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

Reply via email to