diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 10:59:28 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 10:59:28 +0000 |
| commit | 300967cc6dd0335308d9e06d93720649e0403a26 (patch) | |
| tree | 0e3e011d3747b0794933ef83bc8a1201fb2de095 /third_party/devscripts | |
| parent | 5ef33f4bd092c8ee1fefc8fd309c96fd8e46d467 (diff) | |
| download | chromium_src-300967cc6dd0335308d9e06d93720649e0403a26.zip chromium_src-300967cc6dd0335308d9e06d93720649e0403a26.tar.gz chromium_src-300967cc6dd0335308d9e06d93720649e0403a26.tar.bz2 | |
Update licensecheck.pl to version 2.11.7
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10453077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/devscripts')
| -rw-r--r-- | third_party/devscripts/README.chromium | 2 | ||||
| -rwxr-xr-x | third_party/devscripts/licensecheck.pl | 4 | ||||
| -rw-r--r-- | third_party/devscripts/licensecheck.pl.vanilla | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/third_party/devscripts/README.chromium b/third_party/devscripts/README.chromium index 75611dd..0a67b77 100644 --- a/third_party/devscripts/README.chromium +++ b/third_party/devscripts/README.chromium @@ -1,6 +1,6 @@ Name: devscripts URL: http://anonscm.debian.org/gitweb/?p=devscripts/devscripts.git -Version: 2.11.2 +Version: 2.11.7 Security Critical: no Description: diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl index df7aebc..433807e 100755 --- a/third_party/devscripts/licensecheck.pl +++ b/third_party/devscripts/licensecheck.pl @@ -393,9 +393,9 @@ sub parselicense($) { $licensetext =~ /GNU (?:Affero )?General Public License as published by the Free Software Foundation; version ([^ ]+) /i) { $gplver = " (v$1)"; - } elsif ($licensetext =~ /GNU (Affero ?)General Public License, version ([^ ]+?)[ .]/) { + } elsif ($licensetext =~ /GNU (?:Affero ?)General Public License, version ([^ ]+?)[ .]/) { $gplver = " (v$1)"; - } elsif ($licensetext =~ /either version ([^ ]+) of the License, or \(at your option\) any later version/) { + } elsif ($licensetext =~ /either version ([^ ]+)(?: of the License)?, or \(at your option\) any later version/) { $gplver = " (v$1 or later)"; } diff --git a/third_party/devscripts/licensecheck.pl.vanilla b/third_party/devscripts/licensecheck.pl.vanilla index 3a0634a..9f5de0c 100644 --- a/third_party/devscripts/licensecheck.pl.vanilla +++ b/third_party/devscripts/licensecheck.pl.vanilla @@ -392,9 +392,9 @@ sub parselicense($) { $licensetext =~ /GNU (?:Affero )?General Public License as published by the Free Software Foundation; version ([^ ]+) /i) { $gplver = " (v$1)"; - } elsif ($licensetext =~ /GNU (Affero ?)General Public License, version ([^ ]+?)[ .]/) { + } elsif ($licensetext =~ /GNU (?:Affero ?)General Public License, version ([^ ]+?)[ .]/) { $gplver = " (v$1)"; - } elsif ($licensetext =~ /either version ([^ ]+) of the License, or \(at your option\) any later version/) { + } elsif ($licensetext =~ /either version ([^ ]+)(?: of the License)?, or \(at your option\) any later version/) { $gplver = " (v$1 or later)"; } |