This is an automated email from the git hooks/post-receive script. dod pushed a commit to branch master in repository devscripts.
commit bebf0448e0556a4d5718ca63df0039aecdfc8773 Author: Dominique Dumont <[email protected]> Date: Fri May 15 15:32:24 2015 +0200 licensecheck: handle LGPL as written by IBM (Closes: #587970) --- debian/changelog | 1 + scripts/licensecheck.pl | 5 +++-- test/licensecheck/lgpl-big-blue.h | 14 ++++++++++++++ test/test_licensecheck | 1 + 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e3a1cd..44b9c0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ devscripts (2.15.5) UNRELEASED; urgency=medium * support academic free license (Closes: #534987) * allow © owner to mention "and others" * support eclipse public license (Closes: #587892) + * handle LGPL as written by IBM (Closes: #587970) -- Cyril Brulebois <[email protected]> Tue, 28 Apr 2015 16:58:36 +0200 diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl index 63c627e..1536f80 100755 --- a/scripts/licensecheck.pl +++ b/scripts/licensecheck.pl @@ -469,7 +469,7 @@ sub parselicense { $licensetext =~ /GNU (?:Affero )?(?:Lesser |Library )?General Public License (?:as )?published by the Free Software Foundation[;,] version ([^, ]+?)[.,]? /i) { $gplver = " (v$1)"; - } elsif ($licensetext =~ /GNU (?:Affero )?(?:Lesser |Library )?General Public License, version (\d+(?:\.\d+)?)[ \.]/) { + } elsif ($licensetext =~ /GNU (?:Affero )?(?:Lesser |Library )?General Public License\s*(?:[(),GPL]+)\s*version (\d+(?:\.\d+)?)[ \.]/i) { $gplver = " (v$1)"; } elsif ($licensetext =~ /either version ([^ ]+)(?: of the License)?, or \(at your option\) any later version/) { $gplver = " (v$1 or later)"; @@ -479,6 +479,7 @@ sub parselicense { $gplver = " (v$1)"; } + if ($licensetext =~ /(?:675 Mass Ave|59 Temple Place|51 Franklin Steet|02139|02111-1307)/i) { $extrainfo = " (with incorrect FSF address)$extrainfo"; } @@ -493,7 +494,7 @@ sub parselicense { $license = "GENERATED FILE"; } - if ($licensetext =~ /((is free software.? )?you can redistribute (it|them) and\/or modify (it|them)|is licensed) under the terms of (version [^ ]+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i) { + if ($licensetext =~ /(are made available|(is free software.? )?you can redistribute (it|them) and\/or modify (it|them)|is licensed) under the terms of (version [^ ]+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i) { $license = "LGPL$gplver$extrainfo $license"; } diff --git a/test/licensecheck/lgpl-big-blue.h b/test/licensecheck/lgpl-big-blue.h new file mode 100644 index 0000000..d1f288c --- /dev/null +++ b/test/licensecheck/lgpl-big-blue.h @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2000, 2010 IBM Corporation and others. All rights reserved. + * The contents of this file are made available under the terms + * of the GNU Lesser General Public License (LGPL) Version 2.1 that + * accompanies this distribution (lgpl-v21.txt). The LGPL is also + * available at http://www.gnu.org/licenses/lgpl.html. If the version + * of the LGPL at http://www.gnu.org is different to the version of + * the LGPL accompanying this distribution and there is any conflict + * between the two license versions, the terms of the LGPL accompanying + * this distribution shall govern. + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ diff --git a/test/test_licensecheck b/test/test_licensecheck index 0a18fbc..8ea1a25 100755 --- a/test/test_licensecheck +++ b/test/test_licensecheck @@ -64,6 +64,7 @@ testLGPL() { license "lgpl-3+.h" "LGPL (v3 or later)" license "lgpl-variation.c" "LGPL (v3 or later)" license "lgpl-no-version.h" "LGPL (unversioned/unknown version)" + license2 "-m --copyright" "lgpl-big-blue.h" "LGPL (v2.1) 2000, 2010 IBM Corporation and others. All rights reserved" } testGPL() { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
