This is an automated email from the git hooks/post-receive script. dod pushed a commit to branch master in repository libconfig-model-dpkg-perl.
commit f189f759e48b0db01a161303d5d9ae1377e51566 Author: Dominique Dumont <d...@debian.org> Date: Wed Feb 24 08:43:25 2016 +0100 (c) check: complain only about vanilla MIT license --- lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl | 10 +++++----- t/model_tests.d/dpkg-copyright-examples/oar | 4 ++-- t/model_tests.d/dpkg-copyright-test-conf.pl | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl b/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl index d470cad..9448f4d 100644 --- a/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl +++ b/lib/Config/Model/models/Dpkg/Copyright/FileLicense.pl @@ -104,17 +104,17 @@ $lic->move($old,$_) unless $text or $lic->defined($_); ', 'msg' => 'Please use BSD-x-clause name, like BSD-3-clause' }, - 'UNKNOWN' => { - 'msg' => 'Unknown license: please add correct value or remove the File entry.' - }, - '\\bMIT\\b' => { + '(^|\\s)MIT(\\s|$)' => { 'fix' => '# need to test if target exists before moving element my $lic = $self->grab(\'- - - License\'); my $text = $self->grab_value(\'- full_license\'); $lic->move($_,\'Expat\') unless $text or $lic->defined(\'Expat\') ; $_ = \'Expat\'; ', - 'msg' => 'There are many versions of the MIT license. Please use Expat instead, when it matches. See L<Debian copyright format|https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#license-specification> for details.' + 'msg' => 'There are many versions of the MIT license. Please use Expat instead, when it matches. See L<Debian copyright format|https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#license-specification> and L<wikipedia|https://en.wikipedia.org/wiki/MIT_License#Various_versions>for details.' + }, + 'UNKNOWN' => { + 'msg' => 'Unknown license: please add correct value or remove the File entry.' } }, 'warp' => { diff --git a/t/model_tests.d/dpkg-copyright-examples/oar b/t/model_tests.d/dpkg-copyright-examples/oar index 23d2d45..a904c1d 100644 --- a/t/model_tests.d/dpkg-copyright-examples/oar +++ b/t/model_tests.d/dpkg-copyright-examples/oar @@ -18,7 +18,7 @@ License: Artistic Files: sources/extra/orpheus/modules/lua-signal/lsignal.c Copyright: 2010 Patrick J. Donnelly (batr...@batbytes.com) -License: MIT/X11 +License: MIT Files: sources/extra/ocaml-schedulers/common/OCamlMakefile Copyright: 1999-2007 Markus Mottl @@ -67,7 +67,7 @@ License: LGPL-2.1 On Debian systems you can find a copy of this license in /usr/share/common-licenses/LGPL-2.1 -License: MIT/X11 +License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including diff --git a/t/model_tests.d/dpkg-copyright-test-conf.pl b/t/model_tests.d/dpkg-copyright-test-conf.pl index 8b93a8b..345574f 100644 --- a/t/model_tests.d/dpkg-copyright-test-conf.pl +++ b/t/model_tests.d/dpkg-copyright-test-conf.pl @@ -212,7 +212,7 @@ in ‘/usr/share/common-licenses/GPL-1’.", check => { 'Files:"sources/extra/orpheus/modules/lua-signal/lsignal.c" License short_name' - => 'MIT/X11' + => 'MIT' } }, { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libconfig-model-dpkg-perl.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