summaryrefslogtreecommitdiffstats
path: root/third_party/devscripts
diff options
context:
space:
mode:
authorplundblad@chromium.org <plundblad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-09 00:59:33 +0000
committerplundblad@chromium.org <plundblad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-09 00:59:33 +0000
commit2ea858dc0382b2fcd1d99f175c5bad75996604f4 (patch)
tree5762d420d40c528d7f10348bb246e3201083c329 /third_party/devscripts
parent0c5aa5a7ff0e79f390bbf9a448f6c791c8ec2454 (diff)
downloadchromium_src-2ea858dc0382b2fcd1d99f175c5bad75996604f4.zip
chromium_src-2ea858dc0382b2fcd1d99f175c5bad75996604f4.tar.gz
chromium_src-2ea858dc0382b2fcd1d99f175c5bad75996604f4.tar.bz2
Add liblouis to third_party.
liblouis is a braille translation library that is used inside the ChromeVox extension, where it is included as a native client binary. This adjust the lincense check scripts for the headers used in this library. BUG=303795,316353 Review URL: https://codereview.chromium.org/35683004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/devscripts')
-rwxr-xr-xthird_party/devscripts/licensecheck.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl
index 28f471e..f7be5c5 100755
--- a/third_party/devscripts/licensecheck.pl
+++ b/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 {