[SCM] Debian packaging of libsoftware-license-perl branch, master, updated. debian/0.103004-2-25-g03b6230
Dominique Dumont
dod at debian.org
Wed Dec 12 11:28:00 UTC 2012
The following commit has been merged in the master branch:
commit fa53704bf4b59088d284931cf1a069d85bf08a56
Author: Dominique Dumont <dod at debian.org>
Date: Tue Dec 11 13:54:40 2012 +0100
re-organised patches so upstream can cherry-pick them
diff --git a/debian/patches/add_or_later_clause b/debian/patches/add_or_later_clause
index df653c6..524d662 100644
--- a/debian/patches/add_or_later_clause
+++ b/debian/patches/add_or_later_clause
@@ -1,7 +1,7 @@
Description: add or_later license parameter
--- a/lib/Software/License.pm
+++ b/lib/Software/License.pm
-@@ -75,9 +74,11 @@
+@@ -75,9 +75,11 @@
Carp::confess "couldn't build $which section" unless
my $template = $self->section_data($which);
@@ -14,3 +14,58 @@ Description: add or_later license parameter
DELIMITERS => [ qw({{ }}) ],
);
}
+--- a/lib/Software/LicenseUtils.pm
++++ b/lib/Software/LicenseUtils.pm
+@@ -100,12 +100,19 @@
+
+ my %short_name = (
+ 'GPL-1' => [ 'GPL_1' ],
++ 'GPL-1+' => [ 'GPL_1', or_later => 1 ],
+ 'GPL-2' => [ 'GPL_2' ],
++ 'GPL-2+' => [ 'GPL_2', or_later => 1 ],
+ 'GPL-3' => [ 'GPL_3' ],
++ 'GPL-3+' => [ 'GPL_3', or_later => 1 ],
+ 'LGPL-2' => [ 'LGPL_2' ],
++ 'LGPL-2+' => [ 'LGPL_2', or_later => 1 ],
+ 'LGPL-2.1' => [ 'LGPL_2_1' ],
++ 'LGPL-2.1+' => [ 'LGPL_2_1', or_later => 1 ],
+ 'LGPL-3' => [ 'LGPL_3_0' ],
+ 'LGPL-3.0' => [ 'LGPL_3_0' ],
++ 'LGPL-3+' => [ 'LGPL_3_0', or_later => 1 ],
++ 'LGPL-3.0+' => [ 'LGPL_3_0', or_later => 1 ],
+ 'Artistic' => [ 'Artistic_1_0' ],
+ 'Artistic-1' => [ 'Artistic_1_0' ],
+ 'Artistic-2' => [ 'Artistic_2_0' ],
+--- a/t/summary.t
++++ b/t/summary.t
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+
+-use Test::More tests => 6;
++use Test::More tests => 13;
+
+ # try LGP2 license
+
+@@ -18,6 +18,21 @@
+ is($license->holder, 'X. Ample', '(c) holder');
+ isa_ok($license,'Software::License::LGPL_2',"license class");
+ like($license->summary, qr/common-licenses/i, 'common-licenses found');
++unlike($license->summary, qr/later version/i, 'later version clause not included');
++like($license->name, qr/version 2/i, "license name");
++like($license->fulltext, qr/library/i, 'license text');
++
++}
++{
++my $license = $class->new_from_short_name({
++ short_name => 'LGPL-2+',
++ holder => 'X. Ample'
++});
++
++is($license->holder, 'X. Ample', '(c) holder');
++isa_ok($license,'Software::License::LGPL_2',"license class");
++like($license->summary, qr/common-licenses/i, 'common-licenses found');
++like($license->summary, qr/later version/i, 'later version clause found');
+ like($license->name, qr/version 2/i, "license name");
+ like($license->fulltext, qr/library/i, 'license text');
+
diff --git a/debian/patches/new_from_short_name b/debian/patches/new_from_short_name
index eb2acd2..f3112fe 100644
--- a/debian/patches/new_from_short_name
+++ b/debian/patches/new_from_short_name
@@ -10,25 +10,18 @@ Author: dod
package Software::LicenseUtils;
{
$Software::LicenseUtils::VERSION = '0.103005';
-@@ -96,6 +98,43 @@
+@@ -96,6 +98,36 @@
*guess_license_from_meta_yml = \&guess_license_from_meta;
+my %short_name = (
+ 'GPL-1' => [ 'GPL_1' ],
-+ 'GPL-1+' => [ 'GPL_1', or_later => 1 ],
+ 'GPL-2' => [ 'GPL_2' ],
-+ 'GPL-2+' => [ 'GPL_2', or_later => 1 ],
+ 'GPL-3' => [ 'GPL_3' ],
-+ 'GPL-3+' => [ 'GPL_3', or_later => 1 ],
+ 'LGPL-2' => [ 'LGPL_2' ],
-+ 'LGPL-2+' => [ 'LGPL_2', or_later => 1 ],
+ 'LGPL-2.1' => [ 'LGPL_2_1' ],
-+ 'LGPL-2.1+' => [ 'LGPL_2_1', or_later => 1 ],
+ 'LGPL-3' => [ 'LGPL_3_0' ],
+ 'LGPL-3.0' => [ 'LGPL_3_0' ],
-+ 'LGPL-3+' => [ 'LGPL_3_0', or_later => 1 ],
-+ 'LGPL-3.0+' => [ 'LGPL_3_0', or_later => 1 ],
+ 'Artistic' => [ 'Artistic_1_0' ],
+ 'Artistic-1' => [ 'Artistic_1_0' ],
+ 'Artistic-2' => [ 'Artistic_2_0' ],
@@ -54,3 +47,21 @@ Author: dod
1;
__END__
+@@ -130,6 +162,17 @@
+ method makes a guess as to which licenses may apply to the distribution. It
+ will return a list of zero or more Software::License instances or classes.
+
++=head new_from_short_name
++
++ my $license_object = Software::LicenseUtils->new_from_short_name( {
++ short_name => 'GPL-1',
++ holder => 'X. Ample'
++ }) ;
++
++Create a new L<Software::License> object from the license specified
++with C<short_name>. Known short license names are C<GPL-*>, C<LGPL-*> ,
++C<Artistic> and C<Artistic-*>
++
+ =head1 AUTHOR
+
+ Ricardo Signes <rjbs at cpan.org>
diff --git a/debian/patches/series b/debian/patches/series
index 2d8d9c6..c1b7afe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,5 @@ gpl-3-summary
lgpl-2-1-summary
lgpl-3-summary
lgpl-2-summary
-add_or_later_clause
summary_test
+add_or_later_clause
diff --git a/debian/patches/summary_test b/debian/patches/summary_test
index 2485e3d..1ffd9ad 100644
--- a/debian/patches/summary_test
+++ b/debian/patches/summary_test
@@ -1,12 +1,12 @@
Description: new test for summary feature
--- /dev/null
+++ b/t/summary.t
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,24 @@
+#!perl
+use strict;
+use warnings;
+
-+use Test::More tests => 13;
++use Test::More tests => 6;
+
+# try LGP2 license
+
@@ -22,21 +22,6 @@ Description: new test for summary feature
+is($license->holder, 'X. Ample', '(c) holder');
+isa_ok($license,'Software::License::LGPL_2',"license class");
+like($license->summary, qr/common-licenses/i, 'common-licenses found');
-+unlike($license->summary, qr/later version/i, 'later version clause not included');
-+like($license->name, qr/version 2/i, "license name");
-+like($license->fulltext, qr/library/i, 'license text');
-+
-+}
-+{
-+my $license = $class->new_from_short_name({
-+ short_name => 'LGPL-2+',
-+ holder => 'X. Ample'
-+});
-+
-+is($license->holder, 'X. Ample', '(c) holder');
-+isa_ok($license,'Software::License::LGPL_2',"license class");
-+like($license->summary, qr/common-licenses/i, 'common-licenses found');
-+like($license->summary, qr/later version/i, 'later version clause found');
+like($license->name, qr/version 2/i, "license name");
+like($license->fulltext, qr/library/i, 'license text');
+
--
Debian packaging of libsoftware-license-perl
More information about the Pkg-perl-cvs-commits
mailing list