This is an automated email from the git hooks/post-receive script. periapt pushed a commit to branch master in repository license-reconcile.
commit f68a86f11493f76c5e73e4e496dbe5c78cb5a137 Author: Nicholas Bamber <nicho...@periapt.co.uk> Date: Tue Nov 17 09:45:15 2015 +0000 Added support for Artistic-2.0, GPL-3 and GPL-3+ and others --- debian/changelog | 2 +- lib/Debian/LicenseReconcile/App.pm | 4 ++++ lib/Debian/LicenseReconcile/LicenseCheck.pm | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 36a1369..db9c673 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ license-reconcile (0.9) UNRELEASED; urgency=medium * Code reviewed: bin/license-reconcile [in progress] * Allow file aguments to restrict activity to stated files * Added bash completion file - * Added support for Artistic-2.0, GPL-3 and GPL-3+ + * Added support for Artistic-2.0, GPL-3 and GPL-3+ and others * Added --suggest-stanzas option -- Nicholas Bamber <nicho...@periapt.co.uk> Sat, 07 Nov 2015 23:55:16 +0000 diff --git a/lib/Debian/LicenseReconcile/App.pm b/lib/Debian/LicenseReconcile/App.pm index 03085a3..99346e0 100644 --- a/lib/Debian/LicenseReconcile/App.pm +++ b/lib/Debian/LicenseReconcile/App.pm @@ -145,6 +145,10 @@ sub run { foreach my $f (sort keys %$file_checked) { print "Files: $f\n"; if ($self->check_copyright) { + if (not ref $file_checked->{$f}->{copyright}) { + print "Copyright: $file_checked->{$f}->{copyright}\n"; + next; + } my @copyright = @{$file_checked->{$f}->{copyright}}; if (1 == scalar @copyright) { print "Copyright: $copyright[0]\n"; diff --git a/lib/Debian/LicenseReconcile/LicenseCheck.pm b/lib/Debian/LicenseReconcile/LicenseCheck.pm index e0467b1..21512ec 100644 --- a/lib/Debian/LicenseReconcile/LicenseCheck.pm +++ b/lib/Debian/LicenseReconcile/LicenseCheck.pm @@ -27,6 +27,14 @@ Readonly my %LICENSE_MAPPING => ( 'Apache (v2.0)' => 'Apache-2.0', 'GPL' => 'GPL-2', 'GPL-2' => 'GPL-2', + 'GPL (v1)' => 'GPL-1', + 'GPL (v1 or later)' => 'GPL-1+', + 'LGPL (v2.1)' => 'LGPL-2.1', + 'LGPL (v2.1 or v3) => 'LGPL-2.1 or LGPL-3', + 'LGPL (v2 or v3)' => 'LGPL-2 or LGPL-3', + 'LGPL (v3 or later)' => 'LGPL-3+', + 'MPL (v2.0)' => 'MPL-2.0', + 'Public domain' => 'public-domain', 'GPL (v2)' => 'GPL-2', 'GPL (v2 or later)' => 'GPL-2+', 'GPL (v3)' => 'GPL-3', -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/license-reconcile.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