r47089 - in /trunk/libtext-micromason-perl: MANIFEST META.yml MicroMason.pm MicroMason/Docs/Changes.pod MicroMason/Docs/ReadMe.pod MicroMason/LineNumbers.pm Text-MicroMason-2.03.tar debian/changelog
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Fri Nov 13 03:46:19 UTC 2009
Author: jawnsy-guest
Date: Fri Nov 13 03:46:00 2009
New Revision: 47089
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47089
Log:
integrating new upstream release
Removed:
trunk/libtext-micromason-perl/Text-MicroMason-2.03.tar
Modified:
trunk/libtext-micromason-perl/MANIFEST
trunk/libtext-micromason-perl/META.yml
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/LineNumbers.pm
trunk/libtext-micromason-perl/debian/changelog
Modified: trunk/libtext-micromason-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MANIFEST?rev=47089&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MANIFEST (original)
+++ trunk/libtext-micromason-perl/MANIFEST Fri Nov 13 03:46:00 2009
@@ -87,5 +87,4 @@
t/90-cache-dir-conflict.t
t/91-template_path.t
t/92-template_path-cache.t
-Text-MicroMason-2.03.tar
META.yml Module meta-data (added by MakeMaker)
Modified: trunk/libtext-micromason-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/META.yml?rev=47089&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/META.yml (original)
+++ trunk/libtext-micromason-perl/META.yml Fri Nov 13 03:46:00 2009
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Text-MicroMason
-version: 2.05
+version: 2.06
abstract: Simple and Extensible Templating
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=47089&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason.pm (original)
+++ trunk/libtext-micromason-perl/MicroMason.pm Fri Nov 13 03:46:00 2009
@@ -1,5 +1,5 @@
package Text::MicroMason;
-$VERSION = '2.05';
+$VERSION = '2.06';
# The #line directive requires Perl 5.6 to work correctly the way we use
# it in Base.
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=47089&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod (original)
+++ trunk/libtext-micromason-perl/MicroMason/Docs/Changes.pod Fri Nov 13 03:46:00 2009
@@ -4,6 +4,22 @@
=head1 VERSION 2 HISTORY
+
+=head2 Version 2.06
+
+=over 4
+
+=item 2009-11-11
+
+Fix bug reported in CPAN forum: substr() in LineNumbers.pm was being
+used incorrectly, resulting in incorrect line numbering in some cases.
+
+=item 2009-11-12
+
+#51460: Clean up the tarball and resubmit a version that doesn't
+contain a stray .tgz file.
+
+=back
=head2 Version 2.05
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=47089&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod (original)
+++ trunk/libtext-micromason-perl/MicroMason/Docs/ReadMe.pod Fri Nov 13 03:46:00 2009
@@ -50,7 +50,7 @@
=head1 DISTRIBUTION STATUS
-This is version 2.05 of Text::MicroMason.
+This is version 2.06 of Text::MicroMason.
This module has been available on CPAN for over six years.
Modified: trunk/libtext-micromason-perl/MicroMason/LineNumbers.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/MicroMason/LineNumbers.pm?rev=47089&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/MicroMason/LineNumbers.pm (original)
+++ trunk/libtext-micromason-perl/MicroMason/LineNumbers.pm Fri Nov 13 03:46:00 2009
@@ -1,4 +1,5 @@
package Text::MicroMason::LineNumbers;
+use strict;
######################################################################
@@ -58,31 +59,31 @@
######################################################################
sub lex {
- my $self = shift;
- local $_ = "$_[0]";
-
- my $lexer = $self->can('lex_token')
- or $self->croak_msg('Unable to lex_token(); must select a syntax mixin');
-
- my $filename = $self->{ last_read_file } || 'unknown source';
- my $linenum = $self->{ last_read_line } || 1;
- my $last_pos = 0;
-
- my @tokens;
- until ( /\G\z/gc ) {
- my @parsed = &$lexer( $self )
- or /\G ( .{0,20} ) /gcxs && die "MicroMason parsing halted at '$1'\n";
- push @tokens, 'line_num' => ( $linenum - 1 ) . qq{ "$filename"};
- push @tokens, @parsed;
-
- # Update the current line number by counting newlines in the text
- # we've parsed since the last time through the loop.
- my $new_pos = pos($_);
- $linenum += ( substr($_, $last_pos, $new_pos) =~ tr[\n][] );
- $last_pos = $new_pos;
- }
-
- return @tokens;
+ my $self = shift;
+ local $_ = "$_[0]";
+
+ my $lexer = $self->can('lex_token')
+ or $self->croak_msg('Unable to lex_token(); must select a syntax mixin');
+
+ my $filename = $self->{ last_read_file } || 'unknown source';
+ my $linenum = $self->{ last_read_line } || 1;
+ my $last_pos = 0;
+
+ my @tokens;
+ until ( /\G\z/gc ) {
+ my @parsed = &$lexer( $self )
+ or /\G ( .{0,20} ) /gcxs && die "MicroMason parsing halted at '$1'\n";
+ push @tokens, 'line_num' => ( $linenum - 1 ) . qq{ "$filename"};
+ push @tokens, @parsed;
+
+ # Update the current line number by counting newlines in the text
+ # we've parsed since the last time through the loop.
+ my $new_pos = pos($_) || 0;
+ $linenum += ( substr($_, $last_pos, $new_pos - $last_pos) =~ tr[\n][] );
+ $last_pos = $new_pos;
+ }
+
+ return @tokens;
}
sub assembler_rules {
Modified: trunk/libtext-micromason-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtext-micromason-perl/debian/changelog?rev=47089&op=diff
==============================================================================
--- trunk/libtext-micromason-perl/debian/changelog (original)
+++ trunk/libtext-micromason-perl/debian/changelog Fri Nov 13 03:46:00 2009
@@ -1,10 +1,8 @@
-libtext-micromason-perl (2.05-1) UNRELEASED; urgency=low
-
- NOTE: wtf, .tar.gz still included from upstream
+libtext-micromason-perl (2.06-1) UNRELEASED; urgency=low
* New upstream release
- -- Jonathan Yu <jawnsy at cpan.org> Wed, 11 Nov 2009 19:42:23 -0500
+ -- Jonathan Yu <jawnsy at cpan.org> Thu, 12 Nov 2009 19:19:50 -0500
libtext-micromason-perl (2.03-1) unstable; urgency=low
More information about the Pkg-perl-cvs-commits
mailing list