This is an automated email from the git hooks/post-receive script. dod pushed a commit to branch master in repository devscripts.
commit bdaacc3bd25f7e006b5c474310cf5a9f54584c48 Author: Dominique Dumont <[email protected]> Date: Mon Dec 29 20:52:53 2014 +0100 licensecheck: handle license like GPL version 2 or 3 (which is not GPL-2+) --- scripts/licensecheck.pl | 2 ++ test/licensecheck/lgpl-2-3.c | 17 +++++++++++++++++ test/test_licensecheck | 1 + 3 files changed, 20 insertions(+) diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl index a817a21..badfae8 100755 --- a/scripts/licensecheck.pl +++ b/scripts/licensecheck.pl @@ -440,6 +440,8 @@ sub parselicense { $gplver = " (v$1)"; } elsif ($licensetext =~ /either version ([^ ]+)(?: of the License)?, or \(at your option\) any later version/) { $gplver = " (v$1 or later)"; + } elsif ($licensetext =~ /either version ([^ ]+)(?: of the License)?, or \(at your option\) version (\d(?:[\.-]\d+)*)/) { + $gplver = " (v$1 or v$2)"; } if ($licensetext =~ /(?:675 Mass Ave|59 Temple Place|51 Franklin Steet|02139|02111-1307)/i) { diff --git a/test/licensecheck/lgpl-2-3.c b/test/licensecheck/lgpl-2-3.c new file mode 100644 index 0000000..bece581 --- /dev/null +++ b/test/licensecheck/lgpl-2-3.c @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2014 Devscripts developers + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + */ diff --git a/test/test_licensecheck b/test/test_licensecheck index ac22e84..6ed925e 100755 --- a/test/test_licensecheck +++ b/test/test_licensecheck @@ -48,6 +48,7 @@ testLGPL() { license "lgpl-2.1.c" "LGPL (v2.1)" license "lgpl-2.1.h" "LGPL (v2.1)" license "lgpl-2.s" "LGPL (v2)" + license "lgpl-2-3.c" "LGPL (v2 or v3)" license "lgpl-3+.h" "LGPL (v3 or later)" license "lgpl-variation.c" "LGPL (v3 or later)" } -- 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
