This is an automated email from the git hooks/post-receive script.
js pushed a commit to branch master
in repository licensecheck.
commit 7e830f0763a86cba238b32d94cee9662ac2fdfb9
Author: Jonas Smedegaard <d...@jones.dk>
Date: Tue Oct 4 12:13:12 2016 +0200
Drop too exotic licensing phrase, and corresponding test case.
---
lib/App/Licensecheck.pm | 6 ------
t/grant.t | 7 -------
t/grant/GPL_and_more/init.lua | 8 --------
3 files changed, 21 deletions(-)
diff --git a/lib/App/Licensecheck.pm b/lib/App/Licensecheck.pm
index ffcb0ea..c12d86e 100755
--- a/lib/App/Licensecheck.pm
+++ b/lib/App/Licensecheck.pm
@@ -482,12 +482,6 @@ sub parse_license
}
}
- given ($licensetext) {
- when ( /under(?: the)?(?:GNU)? (AGPL|GPL|LGPL)-?($ver_re)( or
later| (?:and|or)(?: \(at your option\))?(?: any)? later(?: version)?)?,?
(?:and|or)(?: the| a)? $cc_by_sa(?: version)? ($ver_re)(?: License)?(
(?:and|or)(?: \(at your option\))? any later|[,.] Later versions are
permitted)?/i ) {
- $gen_license->( 'CC-BY-SA', $3, $4, $1, $2 );
- }
- }
-
# LGPL
given ($licensetext) {
when ( /(are made available|(is free software.? )?you can
redistribute (it|them) and[ \/]or modify (it|them)|is licensed) under the terms
of (version \S+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i
) {
diff --git a/t/grant.t b/t/grant.t
index cfb8265..0640354 100644
--- a/t/grant.t
+++ b/t/grant.t
@@ -25,13 +25,6 @@ test "Parse corpus" => sub {
}
};
-# GPL
-run_me(
- { license => 'CC-BY-SA',
- corpus => 'GPL_and_more/init.lua'
- }
-);
-
# AGPL
run_me( { license => 'AGPL-3+', corpus => 'AGPL/fastx.c' } );
run_me( { license => 'AGPL-3+', corpus => 'AGPL/fet.cpp' } );
diff --git a/t/grant/GPL_and_more/init.lua b/t/grant/GPL_and_more/init.lua
deleted file mode 100644
index 177640e..0000000
--- a/t/grant/GPL_and_more/init.lua
+++ /dev/null
@@ -1,8 +0,0 @@
---[[
-****
-More Ores
-by Calinou
-with the help of MarkTraceur, GloopMaster and Kotolegokot
-Licensed under GPLv3+ for code and CC BY-SA for textures, see:
http://www.gnu.org/licenses/gpl-3.0.html
-****
---]]
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/licensecheck.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
