[SCM] Debian packaging of libsoftware-license-perl branch, master, updated. debian/0.103002-3-1-g0a538cf

[Dominique Dumont]

The following commit has been merged in the master branch:
commit 0a538cf0ea8ca15d816272aa2c5ddd5bc1d02782
Author: Dominique Dumont <dod at debian.org>
Date:   Sat Oct 8 12:48:05 2011 +0200

    re-organised patches to make upstream life easier

diff --git a/debian/patches/create-license-from-short-name b/debian/patches/create-license-from-short-name
index 08efbf9..3b3d742 100644
--- a/debian/patches/create-license-from-short-name
+++ b/debian/patches/create-license-from-short-name
@@ -1,17 +1,14 @@
 Description: Create license from short name
 --- a/lib/Software/License.pm
 +++ b/lib/Software/License.pm
-@@ -11,15 +11,51 @@
+@@ -11,15 +11,48 @@
  use Sub::Install ();
  use Text::Template ();
  
 +my %short_name = (
 +  'GPL-1'  => 'GPL_1',
-+  'GPL-1+' => 'GPL_1_plus',
 +  'GPL-2'  => 'GPL_2',
-+  'GPL-2+' => 'GPL_2_plus',
 +  'GPL-3'  => 'GPL_3',
-+  'GPL-3+' => 'GPL_3_plus',
 +  'Artistic' => 'Artistic_1_0',
 +  'Artistic-1' => 'Artistic_1_0',
 +  'Artistic-2' => 'Artistic_2_0',
@@ -54,7 +51,7 @@ Description: Create license from short name
  
  sub year   { defined $_[0]->{year} ? $_[0]->{year} : (localtime)[5]+1900 }
  sub holder { $_[0]->{holder}     }
-@@ -117,6 +153,15 @@
+@@ -112,6 +145,15 @@
    holder - the holder of the copyright; required
    year   - the year of copyright; defaults to current year
  
diff --git a/debian/patches/gpl-1-plus-class b/debian/patches/gpl-1-plus-class
index d95a8f0..5bc32e2 100644
--- a/debian/patches/gpl-1-plus-class
+++ b/debian/patches/gpl-1-plus-class
@@ -44,3 +44,34 @@ Description: new class to represent GPL-1+ clauses
 +
 +On Debian systems, the complete text of version 1 of the GNU General
 +Public License can be found in `/usr/share/common-licenses/GPL-1'.
+--- a/t/short_name.t
++++ b/t/short_name.t
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ 
+-use Test::More tests => 6;
++use Test::More tests => 9;
+ 
+ my $class = 'Software::License';
+ require_ok($class);
+@@ -14,3 +14,9 @@
+ isa_ok($license,'Software::License::GPL_1',"license class");
+ like($license->name, qr/version 1/i, "license name");
+ like($license->fulltext, qr/general public/i, 'license text');
++
++my $license_plus = $class->new({ short_name => 'GPL-1+', holder => 'X. Ample' });
++
++is($license_plus->holder, 'X. Ample', '(c) holder');
++is($license_plus->year, (localtime)[5]+1900, '(c) year');
++isa_ok($license_plus,'Software::License::GPL_1_plus',"license class");
+--- a/lib/Software/License.pm
++++ b/lib/Software/License.pm
+@@ -13,6 +13,7 @@
+ 
+ my %short_name = (
+   'GPL-1'  => 'GPL_1',
++  'GPL-1+' => 'GPL_1_plus',
+   'GPL-2'  => 'GPL_2',
+   'GPL-3'  => 'GPL_3',
+   'Artistic' => 'Artistic_1_0',
diff --git a/debian/patches/series b/debian/patches/series
index 074b5a1..2d317c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,13 @@
+create-license-from-short-name
+test-short-name
 summary_method
 artistic_1.0_summary
-gpl-1-summary
+apache-2-summary
 gpl-1-plus-class
-summary_test
-gpl-2-summary
+gpl-1-summary
 gpl-2-plus-class
-gpl-3-summary
+gpl-2-summary
 gpl-3-plus-class
-apache-2-summary
-create-license-from-short-name
-test-short-name
+gpl-3-summary
+summary_test
+
diff --git a/debian/patches/summary_method b/debian/patches/summary_method
index 7d78834..6d6cebd 100644
--- a/debian/patches/summary_method
+++ b/debian/patches/summary_method
@@ -1,7 +1,7 @@
 Description: new method
 --- a/lib/Software/License.pm
 +++ b/lib/Software/License.pm
-@@ -27,6 +27,11 @@
+@@ -60,6 +60,11 @@
  
  sub notice { shift->_fill_in('NOTICE') }
  
@@ -13,7 +13,7 @@ Description: new method
  
  sub license { shift->_fill_in('LICENSE') }
  
-@@ -165,6 +170,13 @@
+@@ -207,6 +212,13 @@
  C<meta_name> returns open_source, restricted, unrestricted, or unknown, that
  value will be used.
  
diff --git a/debian/patches/test-short-name b/debian/patches/test-short-name
index 956af5a..6b60478 100644
--- a/debian/patches/test-short-name
+++ b/debian/patches/test-short-name
@@ -11,10 +11,10 @@ Description: Test short name
 +my $class = 'Software::License';
 +require_ok($class);
 +
-+my $license = $class->new({ short_name => 'GPL-1+', holder => 'X. Ample' });
++my $license = $class->new({ short_name => 'GPL-1', holder => 'X. Ample' });
 +
 +is($license->holder, 'X. Ample', '(c) holder');
 +is($license->year, (localtime)[5]+1900, '(c) year');
-+isa_ok($license,'Software::License::GPL_1_plus',"license class");
-+like($license->name, qr/version 1 or later/i, "license name");
++isa_ok($license,'Software::License::GPL_1',"license class");
++like($license->name, qr/version 1/i, "license name");
 +like($license->fulltext, qr/general public/i, 'license text');

-- 
Debian packaging of libsoftware-license-perl