[libtext-micromason-perl] 05/06: Drop patches, applied upstream.

gregor herrmann gregoa at debian.org
Sat May 28 12:42:29 UTC 2016


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository libtext-micromason-perl.

commit 62131e2658da7148d53da4f4a297dd14fadf882c
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat May 28 14:39:55 2016 +0200

    Drop patches, applied upstream.
---
 debian/patches/0001_fix-typo-in-manpage.patch | 253 --------------------------
 debian/patches/0002_fix-manpage-syntax.patch  |  26 ---
 debian/patches/changes-pod-syntax.patch       |  18 --
 debian/patches/series                         |   3 -
 4 files changed, 300 deletions(-)

diff --git a/debian/patches/0001_fix-typo-in-manpage.patch b/debian/patches/0001_fix-typo-in-manpage.patch
deleted file mode 100644
index 3841fb6..0000000
--- a/debian/patches/0001_fix-typo-in-manpage.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-Description: Fix typo in manpage
-Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
-Last-Updated: 2016-05-21
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=114560
-Bug: https://rt.cpan.org/Ticket/Display.html?id=114560
-
---- a/lib/Text/MicroMason.pm
-+++ b/lib/Text/MicroMason.pm
-@@ -71,7 +71,7 @@ Use the compile method to convert templa
-     $coderef = $mason->compile( text=>$template );
-     print $coderef->('name'=>'Alice');
- 
--Or use the execute method to parse and evalute in one call:
-+Or use the execute method to parse and evaluate in one call:
- 
-     print $mason->execute( text=>$template, 'name'=>'Bob' );
- 
---- a/lib/Text/MicroMason/AllowGlobals.pm
-+++ b/lib/Text/MicroMason/AllowGlobals.pm
-@@ -78,7 +78,7 @@ Share package variables:
- 
-     $mason->set_globals( '$name' => 'Bob' );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->();
-   print $mason->execute( text=>$template );
---- a/lib/Text/MicroMason/Base.pm
-+++ b/lib/Text/MicroMason/Base.pm
-@@ -363,7 +363,7 @@ Create a MicroMason object to interpret
-     use Text::MicroMason;
-     my $mason = Text::MicroMason->new();
- 
--Use the execute method to parse and evalute a template:
-+Use the execute method to parse and evaluate a template:
- 
-     print $mason->execute( text=>$template, 'name'=>'Dave' );
- 
---- a/lib/Text/MicroMason/CatchErrors.pm
-+++ b/lib/Text/MicroMason/CatchErrors.pm
-@@ -39,7 +39,7 @@ Instead of using this class directly, pa
-     use Text::MicroMason;
-     my $mason = Text::MicroMason->new( -CatchErrors );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print scalar $mason->compile( text=>$template )->( @%args );
-   print scalar $mason->execute( text=>$template, @args );
-@@ -59,7 +59,7 @@ Both compilation and run-time errors in
- exceptions. The base MicroMason class will croak() if you attempt to
- compile or execute a template which contains a incorrect fragment of Perl
- syntax. Similarly, if the Perl code in your template causes die() or
--croak() to be called, this will interupt your program unless caught by an
-+croak() to be called, this will interrupt your program unless caught by an
- eval block.
- 
- This class provides that error catching behavior for the compile and
---- a/lib/Text/MicroMason/CompileCache.pm
-+++ b/lib/Text/MicroMason/CompileCache.pm
-@@ -54,7 +54,7 @@ Instead of using this class directly, pa
-     use Text::MicroMason;
-     my $mason = Text::MicroMason->new( -CompileCache );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-     print $mason->execute( text=>$template, 'name'=>'Dave' );
- 
---- a/lib/Text/MicroMason/Debug.pm
-+++ b/lib/Text/MicroMason/Debug.pm
-@@ -99,7 +99,7 @@ Instead of using this class directly, pa
-   use Text::MicroMason;
-   my $mason = Text::MicroMason->new( -Debug );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
-@@ -129,7 +129,7 @@ Alternately, set this to a hash referenc
- 
-   debug => { source => 1, eval => 1 }
- 
--You can also selectively surpress some warnings:
-+You can also selectively suppress some warnings:
- 
-   debug => { default => 1, source => 0, eval => 0 }
- 
---- a/lib/Text/MicroMason/Embperl.pm
-+++ b/lib/Text/MicroMason/Embperl.pm
-@@ -65,7 +65,7 @@ Instead of using this class directly, pa
-     use Text::MicroMason;
-     my $mason = Text::MicroMason::Base->new( -Embperl );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
---- a/lib/Text/MicroMason/Filters.pm
-+++ b/lib/Text/MicroMason/Filters.pm
-@@ -124,7 +124,7 @@ Instead of using this class directly, pa
-     use Text::MicroMason;
-     my $mason = Text::MicroMason->new( -Filters );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
---- a/lib/Text/MicroMason/Functions.pm
-+++ b/lib/Text/MicroMason/Functions.pm
-@@ -66,7 +66,7 @@ Text::MicroMason::Functions - Function E
- 
- =head1 SYNOPSIS
- 
--Use the execute function to parse and evalute a template:
-+Use the execute function to parse and evaluate a template:
- 
-     use Text::MicroMason::Functions qw( execute );
-     print execute($template, 'name'=>'Dave');
---- a/lib/Text/MicroMason/HTMLMason.pm
-+++ b/lib/Text/MicroMason/HTMLMason.pm
-@@ -73,7 +73,7 @@ Create a MicroMason object to interpret
-   use Text::MicroMason;
-   my $mason = Text::MicroMason->new();
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
-@@ -155,7 +155,7 @@ No $r request object. No mod_perl integr
- =back
- 
- Contributed patches to add these features of HTML::Mason would be
--welcomed by the author. Possible implemenations are described in
-+welcomed by the author. Possible implementations are described in
- L<Text::MicroMason::ToDo>.
- 
- =head2 Private Methods
---- a/lib/Text/MicroMason/HTMLTemplate.pm
-+++ b/lib/Text/MicroMason/HTMLTemplate.pm
-@@ -160,7 +160,7 @@ Instead of using this class directly, pa
-   use Text::MicroMason;
-   my $mason = Text::MicroMason::Base->new( -HTMLTemplate );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
---- a/lib/Text/MicroMason/PLP.pm
-+++ b/lib/Text/MicroMason/PLP.pm
-@@ -95,7 +95,7 @@ Instead of using this class directly, pa
-     use Text::MicroMason;
-     my $mason = Text::MicroMason::Base->new( -PLP );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
---- a/lib/Text/MicroMason/PassVariables.pm
-+++ b/lib/Text/MicroMason/PassVariables.pm
-@@ -79,7 +79,7 @@ Instead of using this class directly, pa
-   use Text::MicroMason;
-   my $mason = Text::MicroMason->new( -PassVariables );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( 'name'=>'Dave' );
-   print $mason->execute( text=>$template, 'name'=>'Dave' );
---- a/lib/Text/MicroMason/PostProcess.pm
-+++ b/lib/Text/MicroMason/PostProcess.pm
-@@ -55,7 +55,7 @@ Instead of using this class directly, pa
-     use Text::MicroMason;
-     my $mason = Text::MicroMason->new( -PostProcess );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
---- a/lib/Text/MicroMason/QuickTemplate.pm
-+++ b/lib/Text/MicroMason/QuickTemplate.pm
-@@ -60,7 +60,7 @@ Instead of using this class directly, pa
-   use Text::MicroMason;
-   my $mason = Text::MicroMason::Base->new( -QuickTemplate );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
---- a/lib/Text/MicroMason/Safe.pm
-+++ b/lib/Text/MicroMason/Safe.pm
-@@ -93,7 +93,7 @@ Instead of using this class directly, pa
-   use Text::MicroMason;
-   my $mason = Text::MicroMason->new( -Safe );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
---- a/lib/Text/MicroMason/ServerPages.pm
-+++ b/lib/Text/MicroMason/ServerPages.pm
-@@ -54,7 +54,7 @@ Instead of using this class directly, pa
-     use Text::MicroMason;
-     my $mason = Text::MicroMason::Base->new( -ServerPages );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
---- a/lib/Text/MicroMason/TemplateDir.pm
-+++ b/lib/Text/MicroMason/TemplateDir.pm
-@@ -78,7 +78,7 @@ Instead of using this class directly, pa
-     use Text::MicroMason;
-     my $mason = Text::MicroMason->new( -TemplateDir, template_root=>'/foo' );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( file=>$filepath )->( 'name'=>'Dave' );
-   print $mason->execute( file=>$filepath, 'name'=>'Dave' );
---- a/lib/Text/MicroMason/TemplatePath.pm
-+++ b/lib/Text/MicroMason/TemplatePath.pm
-@@ -71,7 +71,7 @@ Instead of using this class directly, pa
-     use Text::MicroMason;
-     my $mason = Text::MicroMason->new( -TemplatePath, template_path => [ '/foo', '/bar' ] );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( file=>$filepath )->( 'name'=>'Dave' );
-   print $mason->execute( file=>$filepath, 'name'=>'Dave' );
---- a/lib/Text/MicroMason/TextTemplate.pm
-+++ b/lib/Text/MicroMason/TextTemplate.pm
-@@ -59,7 +59,7 @@ Instead of using this class directly, pa
-   use Text::MicroMason;
-   my $mason = Text::MicroMason::Base->new( -TextTemplate );
- 
--Use the standard compile and execute methods to parse and evalute templates:
-+Use the standard compile and execute methods to parse and evaluate templates:
- 
-   print $mason->compile( text=>$template )->( @%args );
-   print $mason->execute( text=>$template, @args );
diff --git a/debian/patches/0002_fix-manpage-syntax.patch b/debian/patches/0002_fix-manpage-syntax.patch
deleted file mode 100644
index f4ddd3a..0000000
--- a/debian/patches/0002_fix-manpage-syntax.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix pod syntax, this breaks pod2man
-Author: Lucas Kanashiro <kanashiro.duarte at gmail.com>
-Last-Updated: 2016-05-21
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=114561
-Bug: https://rt.cpan.org/Ticket/Display.html?id=114561
-
---- a/lib/Text/MicroMason/Filters.pm
-+++ b/lib/Text/MicroMason/Filters.pm
-@@ -221,6 +221,8 @@ Optional comma-separated string of filte
- 
- =back
- 
-+=over 4
-+
- =item default_policy
- 
- Optional. Valid values are "combine" and "override"; default is "combine".  This attribute specifies what happens when both default_filters and inline filters are provided.  
-@@ -229,6 +231,8 @@ If C<default_policy> is "combine" (the d
- 
- "combine" is the default for backwards compatibility purposes, but new uses of the module probably want to use "override" instead.
- 
-+=back
-+
- =head2 Private Methods
- 
- =over 4
diff --git a/debian/patches/changes-pod-syntax.patch b/debian/patches/changes-pod-syntax.patch
deleted file mode 100644
index b5e66b2..0000000
--- a/debian/patches/changes-pod-syntax.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix syntax error in Changes.pod
-Origin: vendor
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2016-05-22
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=114568
-Bug: https://rt.cpan.org/Ticket/Display.html?id=114568
-
---- a/lib/Text/MicroMason/Docs/Changes.pod
-+++ b/lib/Text/MicroMason/Docs/Changes.pod
-@@ -26,7 +26,7 @@
- 
- Add C<default_policy => 'override'> attribute for filter default behavior
- 
--=back.
-+=back
- 
- =head2 Version 2.16
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 531906f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0002_fix-manpage-syntax.patch
-0001_fix-typo-in-manpage.patch
-changes-pod-syntax.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtext-micromason-perl.git



More information about the Pkg-perl-cvs-commits mailing list