[licensecheck] 77/112: Improve detection of license GPL.

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository licensecheck.

commit ed11e131e128cbef13d8cccab3e07c83ea2e8864
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Nov 23 19:18:06 2016 +0100

    Improve detection of license GPL.
---
 lib/App/Licensecheck.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index f1204d2..58281f5 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -579,6 +579,10 @@ sub parse_license
 		when ( /COMPATIBILITY WITH THE GPL LICENSE/i ) {
 			break;
 		}
+		# GPL, among several
+		when ( /$under_terms_of $any_of(?:[^.]|\.\S)* $L{re}{gpl}(?:[,;:]? ?$L{re}{version}{-keep}(?: of the License)?($L{re}{version_later})?)?/i ) {
+			break; # handled in multi-licensing loop
+		}
 		# GPL or LGPL
 		when ( /either $L{re}{gpl}(?:[,;]? ?$L{re}{version}{-keep}(,? $L{re}{version_later_postfix})?)?(?: \((?:the )?"?GPL"?\))?, or $L{re}{lgpl}(?:[,;]? ?$L{re}{version}{-keep}(,? $L{re}{version_later_postfix})?)?/i ) {
 			$gen_license->( 'gpl', $1, $2, 'lgpl', $3, $4 );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/licensecheck.git