[SCM] Debian packaging of libsoftware-license-perl branch, master, updated. debian/0.103004-2-20-g03627e4
Dominique Dumont
dod at debian.org
Mon Dec 10 12:54:30 UTC 2012
The following commit has been merged in the master branch:
commit 118bdc52bf4c0000b92f6a85c58ad7348434b331
Author: Dominique Dumont <dod at debian.org>
Date: Mon Dec 10 13:52:53 2012 +0100
renamed summary patch to a more accurate add_or_later_clause
diff --git a/debian/patches/add_or_later_clause b/debian/patches/add_or_later_clause
new file mode 100644
index 0000000..57cece1
--- /dev/null
+++ b/debian/patches/add_or_later_clause
@@ -0,0 +1,16 @@
+Description: add a summary method
+--- a/lib/Software/License.pm
++++ b/lib/Software/License.pm
+@@ -75,9 +74,11 @@
+ Carp::confess "couldn't build $which section" unless
+ my $template = $self->section_data($which);
+
++ my $later_text = $self->{or_later} ? ", or (at\nyour option) any later version" : '';
++
+ return Text::Template->fill_this_in(
+ $$template,
+- HASH => { self => \$self },
++ HASH => { self => \$self, or_later_clause => $later_text },
+ DELIMITERS => [ qw({{ }}) ],
+ );
+ }
diff --git a/debian/patches/series b/debian/patches/series
index e813360..2d8d9c6 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
-summary
+add_or_later_clause
summary_test
diff --git a/debian/patches/summary b/debian/patches/summary
deleted file mode 100644
index f00cd51..0000000
--- a/debian/patches/summary
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/lib/Software/License.pm
-+++ b/lib/Software/License.pm
-@@ -24,15 +24,14 @@
- sub year { defined $_[0]->{year} ? $_[0]->{year} : (localtime)[5]+1900 }
- sub holder { $_[0]->{holder} }
-
--
--sub notice { shift->_fill_in('NOTICE') }
--
- sub summary {
- my ($self,$distro) = @_;
- $distro ||= 'debian' ;
- $self->_fill_in(uc($distro).'-SUMMARY');
- }
-
-+sub notice { shift->_fill_in('NOTICE') }
-+
- sub license { shift->_fill_in('LICENSE') }
-
-
-@@ -75,9 +74,11 @@
- Carp::confess "couldn't build $which section" unless
- my $template = $self->section_data($which);
-
-+ my $later_text = $self->{or_later} ? ", or (at\nyour option) any later version" : '';
-+
- return Text::Template->fill_this_in(
- $$template,
-- HASH => { self => \$self },
-+ HASH => { self => \$self, or_later_clause => $later_text },
- DELIMITERS => [ qw({{ }}) ],
- );
- }
--
Debian packaging of libsoftware-license-perl
More information about the Pkg-perl-cvs-commits
mailing list