r57268 - in /branches/upstream/libsoftware-license-perl/current: Changes MANIFEST META.yml inc/Module/Install/ExtraTests.pm lib/Software/License.pm lib/Software/License/CC0_1_0.pm lib/Software/License/None.pm
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat May 1 23:15:26 UTC 2010
Author: jawnsy-guest
Date: Sat May 1 23:15:19 2010
New Revision: 57268
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57268
Log:
[svn-upgrade] Integrating new upstream version, libsoftware-license-perl (0.016)
Added:
branches/upstream/libsoftware-license-perl/current/lib/Software/License/CC0_1_0.pm
branches/upstream/libsoftware-license-perl/current/lib/Software/License/None.pm
Modified:
branches/upstream/libsoftware-license-perl/current/Changes
branches/upstream/libsoftware-license-perl/current/MANIFEST
branches/upstream/libsoftware-license-perl/current/META.yml
branches/upstream/libsoftware-license-perl/current/inc/Module/Install/ExtraTests.pm
branches/upstream/libsoftware-license-perl/current/lib/Software/License.pm
Modified: branches/upstream/libsoftware-license-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsoftware-license-perl/current/Changes?rev=57268&op=diff
==============================================================================
--- branches/upstream/libsoftware-license-perl/current/Changes (original)
+++ branches/upstream/libsoftware-license-perl/current/Changes Sat May 1 23:15:19 2010
@@ -1,4 +1,8 @@
Revision history for Software-License
+
+0.016 2010-05-01
+ added the None and CC0_1_0 licenses for the far ends of the spectrum
+ (thanks to Brian Phillips for None)
0.015 2010-03-26
up the Test::More prereq
Modified: branches/upstream/libsoftware-license-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsoftware-license-perl/current/MANIFEST?rev=57268&op=diff
==============================================================================
--- branches/upstream/libsoftware-license-perl/current/MANIFEST (original)
+++ branches/upstream/libsoftware-license-perl/current/MANIFEST Sat May 1 23:15:19 2010
@@ -16,6 +16,7 @@
lib/Software/License/Artistic_1_0.pm
lib/Software/License/Artistic_2_0.pm
lib/Software/License/BSD.pm
+lib/Software/License/CC0_1_0.pm
lib/Software/License/FreeBSD.pm
lib/Software/License/GFDL_1_2.pm
lib/Software/License/GPL_1.pm
@@ -26,6 +27,7 @@
lib/Software/License/MIT.pm
lib/Software/License/Mozilla_1_0.pm
lib/Software/License/Mozilla_1_1.pm
+lib/Software/License/None.pm
lib/Software/License/OpenSSL.pm
lib/Software/License/Perl_5.pm
lib/Software/License/QPL_1_0.pm
Modified: branches/upstream/libsoftware-license-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsoftware-license-perl/current/META.yml?rev=57268&op=diff
==============================================================================
--- branches/upstream/libsoftware-license-perl/current/META.yml (original)
+++ branches/upstream/libsoftware-license-perl/current/META.yml Sat May 1 23:15:19 2010
@@ -27,4 +27,4 @@
resources:
license: http://dev.perl.org/licenses/
repository: http://github.com/rjbs/software-license
-version: 0.015
+version: 0.016
Modified: branches/upstream/libsoftware-license-perl/current/inc/Module/Install/ExtraTests.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsoftware-license-perl/current/inc/Module/Install/ExtraTests.pm?rev=57268&op=diff
==============================================================================
--- branches/upstream/libsoftware-license-perl/current/inc/Module/Install/ExtraTests.pm (original)
+++ branches/upstream/libsoftware-license-perl/current/inc/Module/Install/ExtraTests.pm Sat May 1 23:15:19 2010
@@ -6,46 +6,60 @@
use Module::Install::Base;
BEGIN {
- our $VERSION = '0.006';
+ our $VERSION = '0.007';
our $ISCORE = 1;
our @ISA = qw{Module::Install::Base};
}
+
+our $use_extratests = 0;
sub extra_tests {
my ($self) = @_;
return unless -d 'xt';
- return unless my @content = grep { $_ =~ /^[.]/ } <xt/*>;
+ return unless my @content = grep { $_ !~ /^[.]/ } <xt/*>;
- die "unknown files found in ./xt" if grep { -f } @content;
+ die "unknown files found in ./xt" if grep { !-d } @content;
- my %known = map {; $_ => 1 } qw(author smoke release);
+ my %known = map {; "xt/$_" => 1 } qw(author smoke release);
my @unknown = grep { not $known{$_} } @content;
die "unknown directories found in ./xt: @unknown" if @unknown;
- {
- no warnings qw(closure once);
- package # The newline tells PAUSE, "DO NOT INDEXING!"
- MY;
- sub test_via_harness {
- my ($self, $perl, $tests) = @_;
- my $a_str = -d 'xt/author' ? 'xt/author' : '';
- my $r_str = -d 'xt/release' ? 'xt/release' : '';
- my $s_str = -d 'xt/smoke' ? 'xt/smoke' : '';
- my $is_author = $Module::Install::AUTHOR ? 1 : 0;
+ $use_extratests = 1;
- return qq{\t$perl "-Iinc" "-MModule::Install::ExtraTests" }
- . qq{"-e" "Module::Install::ExtraTests::__harness('Test::Harness', $is_author, '$a_str', '$r_str', '$s_str', \$(TEST_VERBOSE), '\$(INST_LIB)', '\$(INST_ARCHLIB)')" $tests\n};
- }
+ return;
+}
- sub dist_test {
- my ($self, @args) = @_;
- my $text = $self->SUPER::dist_test(@args);
- my @lines = split /\n/, $text;
- $_ =~ s/ (\S*MAKE\S* test )/ RELEASE_TESTING=1 $1 / for grep { m/ test / } @lines;
- return join "\n", @lines;
- }
+{
+ no warnings qw(once);
+ package # The newline tells PAUSE, "DO NOT INDEXING!"
+ MY;
+ sub test_via_harness {
+ my $self = shift;
+ return $self->SUPER::test_via_harness(@_)
+ unless $use_extratests;
+
+ my ($perl, $tests) = @_;
+ my $a_str = -d 'xt/author' ? 'xt/author' : '';
+ my $r_str = -d 'xt/release' ? 'xt/release' : '';
+ my $s_str = -d 'xt/smoke' ? 'xt/smoke' : '';
+ my $is_author = $Module::Install::AUTHOR ? 1 : 0;
+
+ return qq{\t$perl "-Iinc" "-MModule::Install::ExtraTests" }
+ . qq{"-e" "Module::Install::ExtraTests::__harness('Test::Harness', $is_author, '$a_str', '$r_str', '$s_str', \$(TEST_VERBOSE), '\$(INST_LIB)', '\$(INST_ARCHLIB)')" $tests\n};
+ }
+
+ sub dist_test {
+ my ($self, @args) = @_;
+
+ return $self->SUPER::dist_test(@args)
+ unless $use_extratests;
+
+ my $text = $self->SUPER::dist_test(@args);
+ my @lines = split /\n/, $text;
+ $_ =~ s/ (\S*MAKE\S* test )/ RELEASE_TESTING=1 $1 / for grep { m/ test / } @lines;
+ return join "\n", @lines;
}
}
Modified: branches/upstream/libsoftware-license-perl/current/lib/Software/License.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsoftware-license-perl/current/lib/Software/License.pm?rev=57268&op=diff
==============================================================================
--- branches/upstream/libsoftware-license-perl/current/lib/Software/License.pm (original)
+++ branches/upstream/libsoftware-license-perl/current/lib/Software/License.pm Sat May 1 23:15:19 2010
@@ -9,11 +9,11 @@
=head1 VERSION
-version 0.015
-
-=cut
-
-our $VERSION = '0.015';
+version 0.016
+
+=cut
+
+our $VERSION = '0.016';
use Data::Section -setup => { header_re => qr/\A__([^_]+)__\Z/ };
use Sub::Install ();
Added: branches/upstream/libsoftware-license-perl/current/lib/Software/License/CC0_1_0.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsoftware-license-perl/current/lib/Software/License/CC0_1_0.pm?rev=57268&op=file
==============================================================================
--- branches/upstream/libsoftware-license-perl/current/lib/Software/License/CC0_1_0.pm (added)
+++ branches/upstream/libsoftware-license-perl/current/lib/Software/License/CC0_1_0.pm Sat May 1 23:15:19 2010
@@ -1,0 +1,173 @@
+use strict;
+use warnings;
+package Software::License::CC0_1_0;
+use base 'Software::License';
+
+=head1 NAME
+
+Software::License::CC0_1_0 - the "public domain"-like CC0 license, version 1.0
+
+=head1 WARNING
+
+B<You should really think hard before using this license.>
+
+This license is provided for those who want to place their software into the
+public domain. Doing this means you have waived any copyright protection as
+much as allowed by law, and that you grant anybody the right to do anything
+with your software. You cannot reverse your decision to dedicate software as
+public property, so use this only if you're quite sure that you mean to do
+it.
+
+=cut
+
+sub name { q(CC0 License) }
+sub url { q{http://creativecommons.org/publicdomain/zero/1.0/} }
+
+sub meta_name { 'unrestricted' }
+
+1;
+__DATA__
+__NOTICE__
+
+{{$self->holder}} has dedicated the work to the Commons by waiving all of his
+or her rights to the work worldwide under copyright law and all related or
+neighboring legal rights he or she had in the work, to the extent allowable by
+law.
+
+Works under CC0 do not require attribution. When citing the work, you should
+not imply endorsement by the author.
+
+__LICENSE__
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
+SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT
+RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR
+THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR
+DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+PROVIDED HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator and
+subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
+purpose of contributing to a commons of creative, cultural and scientific
+works ("Commons") that the public can reliably and without fear of later
+claims of infringement build upon, modify, incorporate in other works, reuse
+and redistribute as freely as possible in any form whatsoever and for any
+purposes, including without limitation commercial purposes. These owners may
+contribute to the Commons to promote the ideal of a free culture and the
+further production of creative, cultural and scientific works, or to gain
+reputation or greater distribution for their Work in part through the use and
+efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation
+of additional consideration or compensation, the person associating CC0 with
+a Work (the "Affirmer"), to the extent that he or she is an owner of
+Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to
+the Work and publicly distribute the Work under its terms, with knowledge of
+his or her Copyright and Related Rights in the Work and the meaning and
+intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights.
+
+A Work made available under CC0 may be protected by copyright and related or
+neighboring rights ("Copyright and Related Rights"). Copyright and Related
+Rights include, but are not limited to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display,
+ communicate, and translate a Work;
+
+ ii. moral rights retained by the original author(s) and/or performer(s);
+
+ iii. publicity and privacy rights pertaining to a person's image or
+ likeness depicted in a Work;
+
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+
+ v. rights protecting the extraction, dissemination, use and reuse of data
+ in a Work;
+
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation
+ thereof, including any amended or successor version of such
+ directive);
+
+ vii. and other similar, equivalent or corresponding rights throughout the
+ world based on applicable law or treaty, and any national implementations
+ thereof.
+
+2. Waiver.
+
+To the greatest extent permitted by, but not in contravention of, applicable
+law, Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time
+extensions), (iii) in any current or future medium and for any number of
+copies, and (iv) for any purpose whatsoever, including without limitation
+commercial, advertising or promotional purposes (the "Waiver"). Affirmer
+makes the Waiver for the benefit of each member of the public at large and to
+the detriment of Affirmer's heirs and successors, fully intending that such
+Waiver shall not be subject to revocation, rescission, cancellation,
+termination, or any other legal or equitable action to disrupt the quiet
+enjoyment of the Work by the public as contemplated by Affirmer's express
+Statement of Purpose.
+
+3. Public License Fallback.
+
+Should any part of the Waiver for any reason be judged legally invalid or
+ineffective under applicable law, then the Waiver shall be preserved to the
+maximum extent permitted taking into account Affirmer's express Statement of
+Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby
+grants to each affected person a royalty-free, non transferable, non
+sublicensable, non exclusive, irrevocable and unconditional license to
+exercise Affirmer's Copyright and Related Rights in the Work (i) in all
+territories worldwide, (ii) for the maximum duration provided by applicable
+law or treaty (including future time extensions), (iii) in any current or
+future medium and for any number of copies, and (iv) for any purpose
+whatsoever, including without limitation commercial, advertising or
+promotional purposes (the "License"). The License shall be deemed effective
+as of the date CC0 was applied by Affirmer to the Work. Should any part of
+the License for any reason be judged legally invalid or ineffective under
+applicable law, such partial invalidity or ineffectiveness shall not
+invalidate the remainder of the License, and in such case Affirmer hereby
+affirms that he or she will not (i) exercise any of his or her remaining
+Copyright and Related Rights in the Work or (ii) assert any associated claims
+and causes of action with respect to the Work, in either case contrary to
+Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+
+ b. Affirmer offers the Work as-is and makes no representations or
+ warranties of any kind concerning the Work, express, implied, statutory
+ or otherwise, including without limitation warranties of title,
+ merchantability, fitness for a particular purpose, non infringement, or
+ the absence of latent or other defects, accuracy, or the present or
+ absence of errors, whether or not discoverable, all to the greatest
+ extent permissible under applicable law.
+
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without
+ limitation any person's Copyright and Related Rights in the Work.
+ Further, Affirmer disclaims responsibility for obtaining any necessary
+ consents, permissions or other rights required for any use of the Work.
+
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to
+ this CC0 or use of the Work.
+
Added: branches/upstream/libsoftware-license-perl/current/lib/Software/License/None.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsoftware-license-perl/current/lib/Software/License/None.pm?rev=57268&op=file
==============================================================================
--- branches/upstream/libsoftware-license-perl/current/lib/Software/License/None.pm (added)
+++ branches/upstream/libsoftware-license-perl/current/lib/Software/License/None.pm Sat May 1 23:15:19 2010
@@ -1,0 +1,26 @@
+use strict;
+use warnings;
+package Software::License::None;
+use base 'Software::License';
+
+=head1 NAME
+
+Software::License::None - describes a "license" that gives no license for re-use
+
+=cut
+
+sub name { q("No License" License) }
+sub url { undef }
+
+sub meta_name { 'restricted' }
+
+1;
+__DATA__
+__NOTICE__
+This software is copyright (c) {{$self->year}} by {{$self->holder}}
+
+All rights reserved.
+__LICENSE__
+This software is copyright (c) {{$self->year}} by {{$self->holder}}
+
+All rights reserved.
More information about the Pkg-perl-cvs-commits
mailing list