diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/third_party/devscripts | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/devscripts')
| -rwxr-xr-x | chromium/third_party/devscripts/licensecheck.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/devscripts/licensecheck.pl b/chromium/third_party/devscripts/licensecheck.pl index ee8b6f1048e..f7be5c5c0d6 100755 --- a/chromium/third_party/devscripts/licensecheck.pl +++ b/chromium/third_party/devscripts/licensecheck.pl @@ -444,7 +444,7 @@ sub parselicense($) { } if ($licensetext =~ /version ([^, ]+?)[.,]? (?:or later|or any later version) (?:of the GNU (?:Lesser |Library )General Public License )(as )?published by the Free Software Foundation/i or - $licensetext =~ /GNU (?:Lesser |Library )General Public License (?:(?:as )?published by the Free Software Foundation;)?,? (?:either )?[Vv]ersion ([^, ]+?)(?: of the license)?[.,]? (?:or later|or (?:\(at your option\) )?any later version)/i or + $licensetext =~ /(?:GNU (?:Lesser |Library )|(?:Lesser|Library) GNU )General Public License (?:(?:as )?published by the Free Software Foundation;)?,? (?:either )?[Vv]ersion ([^, ]+?)(?: of the license)?[.,]? (?:or later|or (?:\(at your option\) )?any later version)/i or $licensetext =~ /GNU (?:Lesser |Library )General Public License(?: \(LGPL\))?,? [Vv]ersion (\d+(?:\.\d+)?)[ \.]/) { $lgplver = " (v$1 or later)"; } @@ -458,7 +458,7 @@ sub parselicense($) { } if ($licensetext =~ /is (free software.? you can redistribute it and\/or modify it|licensed) under the terms of (version [^ ]+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i or - $licensetext =~ /(is distributed|may be used).*terms.*LGPL/) { + $licensetext =~ /(is distributed|may be used|can redistribute).*terms.*(LGPL|(Lesser|Library) GNU General Public License)/) { if ($lgplver) { $license = "LGPL$lgplver$extrainfo $license"; } else { @@ -485,7 +485,7 @@ sub parselicense($) { $license = "QPL $license"; } - if ($licensetext =~ /opensource\.org\/licenses\/mit-license\.php/) { + if ($licensetext =~ /opensource\.org\/licenses\/mit/) { $license = "MIT/X11 (BSD like) $license"; } elsif ($licensetext =~ /Permission is hereby granted, free of charge, to any person obtaining a copy of this software and(\/or)? associated documentation files \(the (Software|Materials)\), to deal in the (Software|Materials)/) { $license = "MIT/X11 (BSD like) $license"; |