Commit fd037c4d authored by Dominique Dumont's avatar Dominique Dumont

Merge tag 'upstream/0.103008'

Upstream version 0.103008

# gpg: Signature made Sun 01 Dec 2013 06:17:31 PM CET using RSA key ID 49AB2B6C
# gpg: Good signature from "Dominique Dumont <domi.dumont@free.fr>"
# gpg:                 aka "Dominique Dumont (CPAN) <ddumont@cpan.org>"
# gpg:                 aka "Dominique Dumont (HP-GNB) <domi@komarr.gre.hp.com>"
# gpg:                 aka "Dominique Dumont (HP-SEA) <dominique.dumont@hp.com>"
# gpg:                 aka "Dominique Dumont (Debian) <dod@debian.org>"
# gpg:                 aka "Dominique Dumont <dominique.dumont@palm.com>"
parents 49459aa0 2b748387
Revision history for Software-License
0.103008 2013-11-16 22:37:14 America/New_York
- faster! thanks, charsbar!
- add new_from_short_name to LicenseUtils for spdx.org-style
short names; thanks, Dominique Dumont!
- avoid double trailing dots in expanded licenses; thanks, Dave Rolsky!
- fix some errors in (3-clause) BSD license text
- the 2-clause BSD ("FreeBSD") license no longer incorrectly puts
"FreeBSD" as the owner in the license full text
0.103007 2013-10-26 19:57:05 America/New_York
fix regex to allow guessing from meta things like perl_5 (thanks,
Kevin Dawson!)
replace 'use base' with 'use parent'
0.103006 2013-10-20 14:17:53 America/New_York
try harder to identify licenses from all installed License classes;
this is an @INC-scanning change, so be vigilant; thanks, David
......
......@@ -41,8 +41,10 @@ t/basic.t
t/bsd-url.t
t/custom-license
t/custom.t
t/guess_meta_license.t
t/meta-names.t
t/round-trip.t
t/short_name.t
t/utils.t
xt/release/changes_has_content.t
xt/release/pod-syntax.t
This diff is collapsed.
......@@ -4,10 +4,11 @@ author:
- 'Ricardo Signes <rjbs@cpan.org>'
build_requires:
Test::More: 0.96
Try::Tiny: 0
configure_requires:
ExtUtils::MakeMaker: 6.30
dynamic_config: 0
generated_by: 'Dist::Zilla version 4.300039, CPAN::Meta::Converter version 2.132830'
generated_by: 'Dist::Zilla version 5.006, CPAN::Meta::Converter version 2.132830'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
......@@ -21,7 +22,7 @@ requires:
Module::Load: 0
Sub::Install: 0
Text::Template: 0
base: 0
parent: 0
perl: 5.006
strict: 0
warnings: 0
......@@ -29,15 +30,15 @@ resources:
bugtracker: https://github.com/rjbs/Software-License/issues
homepage: https://github.com/rjbs/Software-License
repository: https://github.com/rjbs/Software-License.git
version: 0.103006
version: 0.103008
x_Dist_Zilla:
perl:
version: 5.019004
version: 5.018001
plugins:
-
class: Dist::Zilla::Plugin::Git::GatherDir
name: '@RJBS/Git::GatherDir'
version: 2.016
version: 2.017
-
class: Dist::Zilla::Plugin::CheckPrereqsIndexed
name: '@RJBS/CheckPrereqsIndexed'
......@@ -45,87 +46,87 @@ x_Dist_Zilla:
-
class: Dist::Zilla::Plugin::CheckExtraTests
name: '@RJBS/CheckExtraTests'
version: 0.013
version: 0.016
-
class: Dist::Zilla::Plugin::PromptIfStale
name: '@RJBS/RJBS-Outdated'
version: 0.008
version: 0.013
-
class: Dist::Zilla::Plugin::PromptIfStale
name: '@RJBS/CPAN-Outdated'
version: 0.008
version: 0.013
-
class: Dist::Zilla::Plugin::PruneCruft
name: '@RJBS/@Filter/PruneCruft'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::ManifestSkip
name: '@RJBS/@Filter/ManifestSkip'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::MetaYAML
name: '@RJBS/@Filter/MetaYAML'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::License
name: '@RJBS/@Filter/License'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::Readme
name: '@RJBS/@Filter/Readme'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::ExecDir
name: '@RJBS/@Filter/ExecDir'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::ShareDir
name: '@RJBS/@Filter/ShareDir'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::MakeMaker
name: '@RJBS/@Filter/MakeMaker'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::Manifest
name: '@RJBS/@Filter/Manifest'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::TestRelease
name: '@RJBS/@Filter/TestRelease'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::ConfirmRelease
name: '@RJBS/@Filter/ConfirmRelease'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::UploadToCPAN
name: '@RJBS/@Filter/UploadToCPAN'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::AutoPrereqs
name: '@RJBS/AutoPrereqs'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::Git::NextVersion
name: '@RJBS/Git::NextVersion'
version: 2.016
version: 2.017
-
class: Dist::Zilla::Plugin::PkgVersion
name: '@RJBS/PkgVersion'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::MetaConfig
name: '@RJBS/MetaConfig'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::MetaJSON
name: '@RJBS/MetaJSON'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::NextRelease
name: '@RJBS/NextRelease'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::Test::ChangesHasContent
name: '@RJBS/Test::ChangesHasContent'
......@@ -133,7 +134,7 @@ x_Dist_Zilla:
-
class: Dist::Zilla::Plugin::PodSyntaxTests
name: '@RJBS/PodSyntaxTests'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::ReportVersions::Tiny
name: '@RJBS/ReportVersions::Tiny'
......@@ -145,7 +146,7 @@ x_Dist_Zilla:
phase: test
type: requires
name: '@RJBS/TestMoreWithSubtests'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::PodWeaver
config:
......@@ -154,8 +155,77 @@ x_Dist_Zilla:
finder:
- ':InstallModules'
- ':ExecFiles'
plugins:
-
class: Pod::Weaver::Plugin::EnsurePod5
name: '@CorePrep/EnsurePod5'
version: 4.004
-
class: Pod::Weaver::Plugin::H1Nester
name: '@CorePrep/H1Nester'
version: 4.004
-
class: Pod::Weaver::Section::Name
name: '@RJBS/Name'
version: 4.004
-
class: Pod::Weaver::Section::Version
name: '@RJBS/Version'
version: 4.004
-
class: Pod::Weaver::Section::Region
name: '@RJBS/Prelude'
version: 4.004
-
class: Pod::Weaver::Section::Generic
name: '@RJBS/Synopsis'
version: 4.004
-
class: Pod::Weaver::Section::Generic
name: '@RJBS/Description'
version: 4.004
-
class: Pod::Weaver::Section::Generic
name: '@RJBS/Overview'
version: 4.004
-
class: Pod::Weaver::Section::Generic
name: '@RJBS/Stability'
version: 4.004
-
class: Pod::Weaver::Section::Collect
name: Attributes
version: 4.004
-
class: Pod::Weaver::Section::Collect
name: Methods
version: 4.004
-
class: Pod::Weaver::Section::Collect
name: Functions
version: 4.004
-
class: Pod::Weaver::Section::Leftovers
name: '@RJBS/Leftovers'
version: 4.004
-
class: Pod::Weaver::Section::Region
name: '@RJBS/postlude'
version: 4.004
-
class: Pod::Weaver::Section::Authors
name: '@RJBS/Authors'
version: 4.004
-
class: Pod::Weaver::Section::Legal
name: '@RJBS/Legal'
version: 4.004
-
class: Pod::Weaver::Plugin::Transformer
name: '@RJBS/List'
version: 4.004
name: '@RJBS/PodWeaver'
version: 3.102000
version: 4.002
-
class: Dist::Zilla::Plugin::GithubMeta
name: '@RJBS/GithubMeta'
......@@ -163,45 +233,45 @@ x_Dist_Zilla:
-
class: Dist::Zilla::Plugin::Git::Check
name: '@RJBS/@Git/Check'
version: 2.016
version: 2.017
-
class: Dist::Zilla::Plugin::Git::Commit
name: '@RJBS/@Git/Commit'
version: 2.016
version: 2.017
-
class: Dist::Zilla::Plugin::Git::Tag
name: '@RJBS/@Git/Tag'
version: 2.016
version: 2.017
-
class: Dist::Zilla::Plugin::Git::Push
name: '@RJBS/@Git/Push'
version: 2.016
version: 2.017
-
class: Dist::Zilla::Plugin::FinderCode
name: ':InstallModules'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::FinderCode
name: ':IncModules'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::FinderCode
name: ':TestFiles'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::FinderCode
name: ':ExecFiles'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::FinderCode
name: ':ShareFiles'
version: 4.300039
version: 5.006
-
class: Dist::Zilla::Plugin::FinderCode
name: ':MainModule'
version: 4.300039
version: 5.006
zilla:
class: Dist::Zilla::Dist::Builder
config:
is_trial: 0
version: 4.300039
version: 5.006
......@@ -27,44 +27,41 @@ my %WriteMakefileArgs = (
"Module::Load" => 0,
"Sub::Install" => 0,
"Text::Template" => 0,
"base" => 0,
"parent" => 0,
"strict" => 0,
"warnings" => 0
},
"TEST_REQUIRES" => {
"Test::More" => "0.96"
"Test::More" => "0.96",
"Try::Tiny" => 0
},
"VERSION" => "0.103006",
"VERSION" => "0.103008",
"test" => {
"TESTS" => "t/*.t"
}
);
unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
my $tr = delete $WriteMakefileArgs{TEST_REQUIRES};
my $br = $WriteMakefileArgs{BUILD_REQUIRES};
for my $mod ( keys %$tr ) {
if ( exists $br->{$mod} ) {
$br->{$mod} = $tr->{$mod} if $tr->{$mod} > $br->{$mod};
}
else {
$br->{$mod} = $tr->{$mod};
}
}
}
my %FallbackPrereqs = (
"Carp" => 0,
"Data::Section" => 0,
"File::Spec" => 0,
"IO::Dir" => 0,
"Module::Load" => 0,
"Sub::Install" => 0,
"Test::More" => "0.96",
"Text::Template" => 0,
"Try::Tiny" => 0,
"parent" => 0,
"strict" => 0,
"warnings" => 0
);
unless ( eval { ExtUtils::MakeMaker->VERSION(6.56) } ) {
my $br = delete $WriteMakefileArgs{BUILD_REQUIRES};
my $pp = $WriteMakefileArgs{PREREQ_PM};
for my $mod ( keys %$br ) {
if ( exists $pp->{$mod} ) {
$pp->{$mod} = $br->{$mod} if $br->{$mod} > $pp->{$mod};
}
else {
$pp->{$mod} = $br->{$mod};
}
}
unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
delete $WriteMakefileArgs{TEST_REQUIRES};
delete $WriteMakefileArgs{BUILD_REQUIRES};
$WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs;
}
delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
......
This archive contains the distribution Software-License,
version 0.103006:
version 0.103008:
packages that provide templated software licenses
......
......@@ -3,7 +3,7 @@ use warnings;
use 5.006; # warnings
package Software::License;
{
$Software::License::VERSION = '0.103006';
$Software::License::VERSION = '0.103008';
}
# ABSTRACT: packages that provide templated software licenses
......@@ -88,7 +88,7 @@ Software::License - packages that provide templated software licenses
=head1 VERSION
version 0.103006
version 0.103008
=head1 SYNOPSIS
......
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::AGPL_3;
{
$Software::License::AGPL_3::VERSION = '0.103006';
$Software::License::AGPL_3::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: GNU Affero General Public License, Version 3
sub name { 'The GNU Affero General Public License, Version 3, November 2007' }
......@@ -23,7 +23,7 @@ Software::License::AGPL_3 - GNU Affero General Public License, Version 3
=head1 VERSION
version 0.103006
version 0.103008
=head1 AUTHOR
......
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::Apache_1_1;
{
$Software::License::Apache_1_1::VERSION = '0.103006';
$Software::License::Apache_1_1::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: The Apache Software License, Version 1.1
sub name { 'The Apache Software License, Version 1.1' }
......@@ -22,7 +22,7 @@ Software::License::Apache_1_1 - The Apache Software License, Version 1.1
=head1 VERSION
version 0.103006
version 0.103008
=head1 AUTHOR
......
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::Apache_2_0;
{
$Software::License::Apache_2_0::VERSION = '0.103006';
$Software::License::Apache_2_0::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: The Apache License, Version 2.0
sub name { 'The Apache License, Version 2.0, January 2004' }
......@@ -22,7 +22,7 @@ Software::License::Apache_2_0 - The Apache License, Version 2.0
=head1 VERSION
version 0.103006
version 0.103008
=head1 AUTHOR
......
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::Artistic_1_0;
{
$Software::License::Artistic_1_0::VERSION = '0.103006';
$Software::License::Artistic_1_0::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: The Artistic License
......@@ -38,7 +38,7 @@ Software::License::Artistic_1_0 - The Artistic License
=head1 VERSION
version 0.103006
version 0.103008
=head1 OPTIONS
......
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::Artistic_2_0;
{
$Software::License::Artistic_2_0::VERSION = '0.103006';
$Software::License::Artistic_2_0::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: The Artistic License 2.0
sub name { 'The Artistic License 2.0 (GPL Compatible)' }
......@@ -22,7 +22,7 @@ Software::License::Artistic_2_0 - The Artistic License 2.0
=head1 VERSION
version 0.103006
version 0.103008
=head1 AUTHOR
......
......@@ -2,13 +2,13 @@ use strict;
use warnings;
package Software::License::BSD;
{
$Software::License::BSD::VERSION = '0.103006';
$Software::License::BSD::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: The (three-clause) BSD License
sub name { 'The (three-clause) BSD License' }
sub url { 'http://www.opensource.org/licenses/bsd-license.php' }
sub url { 'http://opensource.org/licenses/BSD-3-Clause' }
sub meta_name { 'bsd' }
sub meta2_name { 'bsd' }
......@@ -22,7 +22,7 @@ Software::License::BSD - The (three-clause) BSD License
=head1 VERSION
version 0.103006
version 0.103008
=head1 AUTHOR
......@@ -59,7 +59,7 @@ met:
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
......
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::CC0_1_0;
{
$Software::License::CC0_1_0::VERSION = '0.103006';
$Software::License::CC0_1_0::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: the "public domain"-like CC0 license, version 1.0
......@@ -24,7 +24,7 @@ Software::License::CC0_1_0 - the "public domain"-like CC0 license, version 1.0
=head1 VERSION
version 0.103006
version 0.103008
=head1 WARNING
......
......@@ -2,11 +2,11 @@ use strict;
use warnings;
package Software::License::Custom;
{
$Software::License::Custom::VERSION = '0.103006';
$Software::License::Custom::VERSION = '0.103008';
}
# ABSTRACT: custom license handler
use base 'Software::License';
use parent 'Software::License';
use Carp;
use Text::Template;
......@@ -101,7 +101,7 @@ Software::License::Custom - custom license handler
=head1 VERSION
version 0.103006
version 0.103008
=head1 DESCRIPTION
......
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::FreeBSD;
{
$Software::License::FreeBSD::VERSION = '0.103006';
$Software::License::FreeBSD::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: The FreeBSD License (aka two-clause BSD)
sub name { 'The (two-clause) FreeBSD License' }
......@@ -23,7 +23,7 @@ Software::License::FreeBSD - The FreeBSD License (aka two-clause BSD)
=head1 VERSION
version 0.103006
version 0.103008
=head1 AUTHOR
......@@ -54,14 +54,14 @@ met:
documentation and/or other materials provided with the
distribution.
THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``AS IS'' AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FREEBSD PROJECT OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::GFDL_1_2;
{
$Software::License::GFDL_1_2::VERSION = '0.103006';
$Software::License::GFDL_1_2::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: The GNU Free Documentation License v1.2
sub name { 'GNU Free Documentation License v1.2' }
......@@ -22,7 +22,7 @@ Software::License::GFDL_1_2 - The GNU Free Documentation License v1.2
=head1 VERSION
version 0.103006
version 0.103008
=head1 AUTHOR
......
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::GFDL_1_3;
{
$Software::License::GFDL_1_3::VERSION = '0.103006';
$Software::License::GFDL_1_3::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: The GNU Free Documentation License v1.3
sub name { 'GNU Free Documentation License v1.3' }
......@@ -22,7 +22,7 @@ Software::License::GFDL_1_3 - The GNU Free Documentation License v1.3
=head1 VERSION
version 0.103006
version 0.103008
=head1 AUTHOR
......
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::GPL_1;
{
$Software::License::GPL_1::VERSION = '0.103006';
$Software::License::GPL_1::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: GNU General Public License, Version 1
sub name { 'The GNU General Public License, Version 1, February 1989' }
......@@ -22,7 +22,7 @@ Software::License::GPL_1 - GNU General Public License, Version 1
=head1 VERSION
version 0.103006
version 0.103008
=head1 AUTHOR
......
......@@ -2,9 +2,9 @@ use strict;
use warnings;
package Software::License::GPL_2;
{
$Software::License::GPL_2::VERSION = '0.103006';
$Software::License::GPL_2::VERSION = '0.103008';
}
use base 'Software::License';
use parent 'Software::License';
# ABSTRACT: GNU General Public License, Version 2
sub name { 'The GNU General Public License, Version 2, June 1991' }
......@@ -22,7 +22,7 @@ Software::License::GPL_2 - GNU General Public License, Version 2
=head1 VERSION