r69945 - in /trunk/libtext-micromason-perl: ./ MicroMason/ MicroMason/Docs/ debian/ debian/patches/ t/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sun Feb 27 17:22:01 UTC 2011
Author: jawnsy-guest
Date: Sun Feb 27 17:21:49 2011
New Revision: 69945
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=69945
Log:
* New upstream release
* Move overrides into more appropriate sections (docs-related things
to override_dh_installdocs, etc.)
* Bump to debhelper 8
* Refresh copyright information
Modified:
trunk/libtext-micromason-perl/META.yml
trunk/libtext-micromason-perl/Makefile.PL
trunk/libtext-micromason-perl/MicroMason.pm
trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod
trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod
trunk/libtext-micromason-perl/MicroMason/HasParams.pm
trunk/libtext-micromason-perl/MicroMason/StoreOne.pm
trunk/libtext-micromason-perl/debian/changelog
trunk/libtext-micromason-perl/debian/compat
trunk/libtext-micromason-perl/debian/control
trunk/libtext-micromason-perl/debian/copyright
trunk/libtext-micromason-perl/debian/patches/series
trunk/libtext-micromason-perl/debian/rules
trunk/libtext-micromason-perl/t/32-safe.t
trunk/libtext-micromason-perl/t/84-func-errors.t
trunk/libtext-micromason-perl/t/85-func-file.t
Modified: trunk/libtext-micromason-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/META.yml?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/META.yml (original)
+++ trunk/libtext-micromason-perl/META.yml Sun Feb 27 17:21:49 2011
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Text-MicroMason
-version: 2.10
+version: 2.13
abstract: Simple and Extensible Templating
author:
- Alan Ferrency <ferrency at cpan.org>
@@ -14,12 +14,14 @@
Class::MixinFactory: 0.9
Cwd: 2.21
File::Spec: 0.9
+ perl: 5.006
+ Safe: 0
Test::More: 0.48
no_index:
directory:
- t
- inc
-generated_by: ExtUtils::MakeMaker version 6.56
+generated_by: ExtUtils::MakeMaker version 6.5601
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
Modified: trunk/libtext-micromason-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/Makefile.PL?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/Makefile.PL (original)
+++ trunk/libtext-micromason-perl/Makefile.PL Sun Feb 27 17:21:49 2011
@@ -1,4 +1,4 @@
-# $Id: Makefile.PL,v 1.7 2009/11/16 21:36:24 alan Exp $
+# $Id: Makefile.PL,v 1.8 2010/09/07 20:25:48 alan Exp $
use ExtUtils::MakeMaker;
@@ -12,7 +12,9 @@
'File::Spec' => 0.9,
'Cwd' => 2.21,
'Test::More' => 0.48,
+ 'Safe' => 0,
},
+ MIN_PERL_VERSION => 5.006,
ABSTRACT_FROM => 'MicroMason.pm',
AUTHOR => 'Alan Ferrency <ferrency at cpan.org>',
Modified: trunk/libtext-micromason-perl/MicroMason.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason.pm?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason.pm (original)
+++ trunk/libtext-micromason-perl/MicroMason.pm Sun Feb 27 17:21:49 2011
@@ -1,5 +1,5 @@
package Text::MicroMason;
-$VERSION = '2.10';
+$VERSION = '2.13';
# The #line directive requires Perl 5.6 to work correctly the way we use
# it in Base.
@@ -120,7 +120,7 @@
$code_ref = $mason->compile( $type => $source, %attribs );
Any attributes provided to compile() will temporarily override the
-persistant options defined by new(), for that template only.
+persistent options defined by new(), for that template only.
You can provide the template as a text string, a file name, or an open
file handle:
@@ -164,9 +164,9 @@
$mason->compile( text=>'Hello <% $ARGS{name} %>.' )->( name=>'Dave' );
-Additionally, you can use named arugments with the %args block syntax:
-
- $mason->compile( text=>'%args>$label</%args>Hello <% $label %>.' )->( name=>'Dave' );
+Additionally, you can use named arguments with the %args block syntax:
+
+ $mason->compile( text=>'<%args>$name</%args>Hello <% $name %>.' )->( name=>'Dave' );
=head2 Mixin Selection
@@ -515,7 +515,7 @@
MicroMason compilation failed: %s
-The template was parsed succesfully, but the Perl subroutine declaration
+The template was parsed successfully, but the Perl subroutine declaration
it was converted to failed to compile. This is generally a result of a
syntax error in one of the Perl expressions used within the template.
@@ -537,7 +537,7 @@
MicroMason execution failed: %s
-After parsing and compiling the template succesfully, the subroutine was
+After parsing and compiling the template successfully, the subroutine was
run and caused a fatal exception, generally because that some Perl code
used within the template caused die() to be called (or an equivalent
function like croak or confess).
Modified: trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod (original)
+++ trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod Sun Feb 27 17:21:49 2011
@@ -6,6 +6,41 @@
=head1 VERSION 2 HISTORY
=over 4
+
+=head2 Version 2.13
+
+=item 2011-01-13
+
+[rt.cpan.org #64192] Skip the Safe-related tests more often, since newer
+versions of Safe.pm mark their own failing tests as TODO instead of
+changing the module's behavior.
+
+=head2 Version 2.12
+
+=item 2010-09-07
+
+Skip more tests that fail due to a bug in Safe.pm. Add a prereq for
+Safe.pm so CPAN testers will provide more debug info on failure.
+
+=head2 Version 2.11
+
+=item 2010-09-07
+
+[rt.cpan.org #61010] Fix spelling errors and pod example bugs. Thanks to
+vshih at yahoo.com for reporting these problems.
+
+=item 2010-09-07
+
+Under Perl 5.13.1 and later with Safe version 2.27, skip failing tests
+in t/32-safe.t. The regression tests for Safe 2.27 fail in Perl 5.13.1
+as well, in a similar way. This bug is not fixable in any reasonable way
+until Safe.pm is also stable.
+
+=item 2010-07-26
+
+[rt.cpan.org #59081] Fix spelling and pod errors. Thanks to Ansgar
+Burchardt and the Debian project for submitting this bug report along
+with patches.
=head2 Version 2.10
@@ -23,14 +58,15 @@
feature, but I don't want anyone to use it who isn't already using it,
until we know it can be supported in the future.
+Thanks to Niko Tyni and the Debian Perl Group for submitting this bug report.
+
=item 2010-04-05
-"uninitialized" warnings in templates were being taggedgenerated at a
-line number within MicroMason instead of a line number within the
-template itself. Thanks to Mike Kelly for a patch: by concatenating
-an empty string to each TOKEN within the template, the warning's line
-number is shifted to inside the template where the interpolation took
-place.
+"uninitialized" warnings in templates were being generated at a line
+number within MicroMason instead of a line number within the template
+itself. Thanks to Mike Kelly for a patch: by concatenating an empty
+string to each TOKEN within the template, the warning's line number is
+shifted to inside the template where the interpolation took place.
=head2 Version 2.09
@@ -187,6 +223,8 @@
Bump version to 2.0
+=back
+
=head2 Version 1.993_01
=over 4
@@ -427,7 +465,9 @@
=item 2004-10-19
-Fixed problem with extra semicolons breaking code statements broken onto multiple % code lines; thanks to Alan Ferrency for test code to isolate the problem, now added to regression tests.
+Fixed problem with extra semicolons breaking code statements broken onto
+multiple % code lines; thanks to Alan Ferrency for test code to isolate
+the problem, now added to regression tests.
=item 2004-10-17
Modified: trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod (original)
+++ trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod Sun Feb 27 17:21:49 2011
@@ -50,7 +50,7 @@
=head1 DISTRIBUTION STATUS
-This is version 2.10 of Text::MicroMason.
+This is version 2.13 of Text::MicroMason.
If you encounter any problems, please inform the current maintainer and
I'll endeavor to patch them promptly.
@@ -163,7 +163,11 @@
Alexander
Matthew Simon Cavalletto
Jon Warbrick
-
+ Frank Wiegand
+ Mike Kelly
+ Niko Tyni
+ Ansgar Burchardt
+ vshih
=head1 SOURCE MATERIAL
Modified: trunk/libtext-micromason-perl/MicroMason/HasParams.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason/HasParams.pm?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/HasParams.pm (original)
+++ trunk/libtext-micromason-perl/MicroMason/HasParams.pm Sun Feb 27 17:21:49 2011
@@ -72,6 +72,10 @@
######################################################################
+=head1 NAME
+
+Text::MicroMason::HasParams - mixin class intended for use with Text::MicroMason::Base
+
=head1 DESCRIPTION
This mixin class ...
@@ -94,7 +98,7 @@
=item assembler_rules()
-Adds initialization for param() at the begining of each subroutine to be compiled.
+Adds initialization for param() at the beginning of each subroutine to be compiled.
=back
Modified: trunk/libtext-micromason-perl/MicroMason/StoreOne.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason/StoreOne.pm?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/StoreOne.pm (original)
+++ trunk/libtext-micromason-perl/MicroMason/StoreOne.pm Sun Feb 27 17:21:49 2011
@@ -35,6 +35,10 @@
__END__
######################################################################
+
+=head1 NAME
+
+Text::MicroMason::StoreOne - mixin class intended for use with Text::MicroMason::Base
=head1 DESCRIPTION
Modified: trunk/libtext-micromason-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/changelog?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/changelog (original)
+++ trunk/libtext-micromason-perl/debian/changelog Sun Feb 27 17:21:49 2011
@@ -1,8 +1,16 @@
-libtext-micromason-perl (2.10-2) UNRELEASED; urgency=low
+libtext-micromason-perl (2.13-1) UNRELEASED; urgency=low
+ [ Jonathan Yu ]
+ * New upstream release
+ * Move overrides into more appropriate sections (docs-related things
+ to override_dh_installdocs, etc.)
+ * Bump to debhelper 8
+ * Refresh copyright information
+
+ [ Ansgar Burchardt ]
* Update my email address.
- -- Ansgar Burchardt <ansgar at debian.org> Mon, 01 Nov 2010 11:17:31 +0100
+ -- Jonathan Yu <jawnsy at cpan.org> Sun, 27 Feb 2011 12:43:59 -0500
libtext-micromason-perl (2.10-1) unstable; urgency=low
Modified: trunk/libtext-micromason-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/compat?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/compat (original)
+++ trunk/libtext-micromason-perl/debian/compat Sun Feb 27 17:21:49 2011
@@ -1,1 +1,1 @@
-7
+8
Modified: trunk/libtext-micromason-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/control?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/control (original)
+++ trunk/libtext-micromason-perl/debian/control Sun Feb 27 17:21:49 2011
@@ -1,20 +1,24 @@
Source: libtext-micromason-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7.0.50)
-Build-Depends-Indep: perl, libclass-mixinfactory-perl (>= 0.9),
- libhtml-parser-perl, liburi-perl (>= 1.53), libtest-warn-perl
+Build-Depends: debhelper (>= 8)
+Build-Depends-Indep: perl,
+ libclass-mixinfactory-perl (>= 0.9),
+ libhtml-parser-perl,
+ liburi-perl (>= 1.53),
+ libtest-warn-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: gregor herrmann <gregoa at debian.org>, Jonathan Yu <jawnsy at cpan.org>,
Chris Butler <chrisb at debian.org>, Ansgar Burchardt <ansgar at debian.org>
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://search.cpan.org/dist/Text-MicroMason/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libtext-micromason-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libtext-micromason-perl/
Package: libtext-micromason-perl
Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libclass-mixinfactory-perl (>= 0.9)
+Depends: ${misc:Depends}, ${perl:Depends},
+ libclass-mixinfactory-perl (>= 0.9)
Suggests: libhtml-parser-perl, libtext-balanced-perl, liburi-perl
Description: simple and extensible templating module
Text::MicroMason interpolates blocks of Perl code embedded into text strings.
Modified: trunk/libtext-micromason-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/copyright?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/copyright (original)
+++ trunk/libtext-micromason-perl/debian/copyright Sun Feb 27 17:21:49 2011
@@ -8,7 +8,9 @@
License: Artistic or GPL-1+
Files: debian/*
-Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
+Copyright: 2009-2011, Jonathan Yu <jawnsy at cpan.org>
+ 2010, Ansgar Burchardt <ansgar at 43-1.org>
+ 2010, Chris Butler <chrisb at debian.org>
2009, gregor herrmann <gregoa at debian.org>
2007-2009, Christoph Berg <myon at debian.org>
License: Artistic or GPL-1+
@@ -16,15 +18,17 @@
Informatik on behalf of Allianz 24.
License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ 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'.
Modified: trunk/libtext-micromason-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/patches/series?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/patches/series (original)
+++ trunk/libtext-micromason-perl/debian/patches/series Sun Feb 27 17:21:49 2011
@@ -1,2 +1,0 @@
-pod-errors
-fix-pod-spelling.patch
Modified: trunk/libtext-micromason-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/rules?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/rules (original)
+++ trunk/libtext-micromason-perl/debian/rules Sun Feb 27 17:21:49 2011
@@ -6,20 +6,26 @@
%:
dh $@
+override_dh_installchangelogs:
+ # Convert changelog to text for installation
+ pod2text MicroMason/Docs/Changes.pod > Changes
+ dh_installchangelogs
+
+override_dh_installdocs:
+ # Convert documentation for installation: README, RELATED, TODO
+ pod2text MicroMason/Docs/ReadMe.pod > README
+ pod2text MicroMason/Docs/Related.pod > RELATED
+ pod2text MicroMason/Docs/ToDo.pod > TODO
+ dh_installdocs
+
override_dh_auto_install:
dh_auto_install
- # Convert changelog to text for installation
- pod2text $(TMP)/usr/share/perl5/Text/MicroMason/Docs/Changes.pod > CHANGES
rm -f $(TMP)/usr/share/perl5/Text/MicroMason/Docs/Changes.pod
rm -f $(TMP)/usr/share/man/man3/Text::MicroMason::Docs::Changes.3pm
- # Convert documentation for installation: README, RELATED, TODO
- pod2text $(TMP)/usr/share/perl5/Text/MicroMason/Docs/ReadMe.pod > README
rm -f $(TMP)/usr/share/perl5/Text/MicroMason/Docs/ReadMe.pod
rm -f $(TMP)/usr/share/man/man3/Text::MicroMason::Docs::ReadMe.3pm
- pod2text $(TMP)/usr/share/perl5/Text/MicroMason/Docs/Related.pod > RELATED
rm -f $(TMP)/usr/share/perl5/Text/MicroMason/Docs/Related.pod
rm -f $(TMP)/usr/share/man/man3/Text::MicroMason::Docs::Related.3pm
- pod2text $(TMP)/usr/share/perl5/Text/MicroMason/Docs/ToDo.pod > TODO
rm -f $(TMP)/usr/share/perl5/Text/MicroMason/Docs/ToDo.pod
rm -f $(TMP)/usr/share/man/man3/Text::MicroMason::Docs::ToDo.3pm
# Remove empty /Docs/ directory
Modified: trunk/libtext-micromason-perl/t/32-safe.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/t/32-safe.t?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/t/32-safe.t (original)
+++ trunk/libtext-micromason-perl/t/32-safe.t Sun Feb 27 17:21:49 2011
@@ -2,6 +2,7 @@
use strict;
use Test::More tests => 24;
+use Safe;
use_ok 'Text::MicroMason', qw( safe_compile safe_execute try_safe_compile try_safe_execute );
@@ -69,7 +70,10 @@
######################################################################
+SKIP:
{
+ skip "Safe doesn't die in Perl >= 5.13.1", 2
+ if $] >= 5.013001;
my $script = qq| <& 'samples/test.msn', %ARGS &> |;
my ($output, $err) = try_safe_execute($script, name => 'Sam', hour => 9);
@@ -77,7 +81,10 @@
like $err, qr/Can't call .*?execute/;
}
+SKIP:
{
+ skip "Safe doesn't die in Perl >= 5.13.1", 2
+ if $] >= 5.013001;
my $m = Text::MicroMason->new( '-Safe' );
my $script = qq| <& 'samples/test.msn', %ARGS &> |;
Modified: trunk/libtext-micromason-perl/t/84-func-errors.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/t/84-func-errors.t?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/t/84-func-errors.t (original)
+++ trunk/libtext-micromason-perl/t/84-func-errors.t Sun Feb 27 17:21:49 2011
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
use strict;
-use Test::More tests => 12;
+use Test::More tests => 16;
use_ok 'Text::MicroMason', qw( compile execute try_compile try_execute );
@@ -21,3 +21,9 @@
like $@, qr/FooBar/;
isa_ok try_compile($scr_die), 'CODE';
is try_execute($scr_die), undef;
+
+# try_execute can return the $@
+ok my ($r, $ok) = try_execute($scr_die);
+is $r, undef;
+like $ok, qr/MicroMason execution failed/;
+like $ok, qr/FooBar/;
Modified: trunk/libtext-micromason-perl/t/85-func-file.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/t/85-func-file.t?rev=69945&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/t/85-func-file.t (original)
+++ trunk/libtext-micromason-perl/t/85-func-file.t Sun Feb 27 17:21:49 2011
@@ -2,6 +2,7 @@
use strict;
use Test::More tests => 9;
+use Safe;
use_ok 'Text::MicroMason', qw( safe_compile safe_execute try_safe_compile try_safe_execute );
@@ -34,7 +35,9 @@
like $output, qr/\Qsorry Dave\E/;
}
-FILE_IS_NOT_SAFE: {
+SKIP: {
+ skip "Safe doesn't die in Perl >= 5.13.1", 2
+ if $] >= 5.013001;
my $script = qq| <& 'samples/test.msn', %ARGS &> |;
my ($output, $err) = try_safe_execute($script, name => 'Sam', hour => 9);
More information about the Pkg-perl-cvs-commits
mailing list