In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/a790e34851cb2a6d181d9cc91717b41d5917db7b?hp=c5fb6bf8085ed840a95d03bfc398ea2cbb5af237>

- Log -----------------------------------------------------------------
commit a790e34851cb2a6d181d9cc91717b41d5917db7b
Author: Steve Hay <[email protected]>
Date:   Tue Mar 17 15:05:37 2015 +0000

    Upgrade Text::ParseWords from version 3.29 to 3.30
    
    This incorporates blead's code differences, but one "customization" remains
    because of EOL issues, which I've sent a pull request upstream to fix.
    
    The latest release also moves the .pm file into the usual place, so the MAP
    is no longer required.
    
    There are no code changes here, so no code freeze violation.
-----------------------------------------------------------------------

Summary of changes:
 Porting/Maintainers.pl                      | 12 +++---------
 cpan/Text-ParseWords/lib/Text/ParseWords.pm | 23 ++++++++++++++---------
 pod/perldelta.pod                           |  4 ++++
 t/porting/customized.dat                    |  1 -
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index d137dd8..85e1b1b 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1085,21 +1085,15 @@ use File::Glob qw(:case);
     },
 
     'Text::ParseWords' => {
-        'DISTRIBUTION' => 'CHORNY/Text-ParseWords-3.29.tar.gz',
+        'DISTRIBUTION' => 'CHORNY/Text-ParseWords-3.30.tar.gz',
         'FILES'        => q[cpan/Text-ParseWords],
 
-        # Waiting to be merged upstream: see CPAN RT#50929
+        # Waiting to be merged upstream:
+        # see https://github.com/chorny/Text-ParseWords/pull/6
         'CUSTOMIZED'   => [
             qw( t/ParseWords.t
-                t/taint.t
                 ),
         ],
-
-        # For the benefit of make_ext.pl, we have to have this accessible:
-        'MAP' => {
-            'ParseWords.pm' => 'cpan/Text-ParseWords/lib/Text/ParseWords.pm',
-            ''              => 'cpan/Text-ParseWords/',
-        },
     },
 
     'Text-Tabs+Wrap' => {
diff --git a/cpan/Text-ParseWords/lib/Text/ParseWords.pm 
b/cpan/Text-ParseWords/lib/Text/ParseWords.pm
index 8771d43..87f9c70 100644
--- a/cpan/Text-ParseWords/lib/Text/ParseWords.pm
+++ b/cpan/Text-ParseWords/lib/Text/ParseWords.pm
@@ -2,7 +2,7 @@ package Text::ParseWords;
 
 use strict;
 require 5.006;
-our $VERSION = "3.29";
+our $VERSION = "3.30";
 
 
 use Exporter;
@@ -202,8 +202,8 @@ one line you can call &parse_line() directly and save a 
function
 call.
 
 The $keep argument is a boolean flag.  If true, then the tokens are
-split on the specified delimiter, but all other characters (quotes,
-backslashes, etc.) are kept in the tokens.  If $keep is false then the
+split on the specified delimiter, but all other characters (including
+quotes and backslashes) are kept in the tokens.  If $keep is false then the
 &*quotewords() functions remove all quotes and backslashes that are
 not themselves backslash-escaped or inside of single quotes (i.e.,
 &quotewords() tries to interpret these characters just like the Bourne
@@ -243,27 +243,27 @@ demonstrating:
 
 =over 4
 
-=item 0
+=item 0Z<>
 
 a simple word
 
-=item 1
+=item 1Z<>
 
 multiple spaces are skipped because of our $delim
 
-=item 2
+=item 2Z<>
 
 use of quotes to include a space in a word
 
-=item 3
+=item 3Z<>
 
 use of a backslash to include a space in a word
 
-=item 4
+=item 4Z<>
 
 use of a backslash to remove the special meaning of a double-quote
 
-=item 5
+=item 5Z<>
 
 another simple word (note the lack of effect of the
 backslashed double-quote)
@@ -295,4 +295,9 @@ for assuring me that a &nested_quotewords() would be 
useful, and to
 Jeff Friedl <[email protected]> for telling me not to worry about
 error-checking (sort of-- you had to be there).
 
+=head1 COPYRIGHT AND LICENSE
+
+This library is free software; you may redistribute and/or modify it
+under the same terms as Perl itself.
+
 =cut
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index cf96a9b..4cc2c19 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -226,6 +226,10 @@ No changes to installed files other than the version bump.
 
 =item *
 
+L<Text::ParseWords> has been upgraded from version 3.29 to 3.30.
+
+=item *
+
 L<threads> has been upgraded from version 1.96_001 to 1.99.
 
 =item *
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index e97bf97..2d97fff 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -1,7 +1,6 @@
 ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/t/pm_to_blib.t 
71ebcee355691ce374fcad251b12d8b2412462b3
 PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t 
ca39f0146e89de02c746e199c45dcb3e5edad691
 Text::ParseWords cpan/Text-ParseWords/t/ParseWords.t 
9bae51c9b944cd5c0bbabe9d397e573976a2be8e
-Text::ParseWords cpan/Text-ParseWords/t/taint.t 
3cff0dae812801f7aa1738d6070508f2c5bcc2e5
 podlators cpan/podlators/scripts/pod2man.PL 
f81acf53f3ff46cdcc5ebdd661c5d13eb35d20d6
 podlators cpan/podlators/scripts/pod2text.PL 
b4693fcfe4a0a1b38a215cfb8985a65d5d025d69
 version cpan/version/lib/version.pm d0923b895d57f1d669ae36fcf85c87b16db341d1

--
Perl5 Master Repository

Reply via email to