r75141 - in /trunk/libjson-pp-perl: Changes MANIFEST META.yml README debian/changelog debian/compat debian/control debian/copyright lib/JSON/PP.pm t/116_incr_parse_fixed.t

ghedo-guest at users.alioth.debian.org ghedo-guest at users.alioth.debian.org
Sun Jun 5 13:14:58 UTC 2011 

Author: ghedo-guest
Date: Sun Jun  5 13:14:51 2011
New Revision: 75141

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=75141
Log:
* New upstream release 2.27105
* New upstream release
* Bump debhelper compat level to 8
* Update upstream copyright year
* Bump Standards-Version to 3.9.2 (no changes needed)

Added:
    trunk/libjson-pp-perl/t/116_incr_parse_fixed.t
      - copied unchanged from r75140, branches/upstream/libjson-pp-perl/current/t/116_incr_parse_fixed.t
Modified:
    trunk/libjson-pp-perl/Changes
    trunk/libjson-pp-perl/MANIFEST
    trunk/libjson-pp-perl/META.yml
    trunk/libjson-pp-perl/README
    trunk/libjson-pp-perl/debian/changelog
    trunk/libjson-pp-perl/debian/compat
    trunk/libjson-pp-perl/debian/control
    trunk/libjson-pp-perl/debian/copyright
    trunk/libjson-pp-perl/lib/JSON/PP.pm

Modified: trunk/libjson-pp-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-pp-perl/Changes?rev=75141&op=diff
==============================================================================
--- trunk/libjson-pp-perl/Changes (original)
+++ trunk/libjson-pp-perl/Changes Sun Jun  5 13:14:51 2011
@@ -20,9 +20,14 @@
 
     * release JSON distribution as stable version.
 
-    * rename JSON::PPdev into JSON::PP and release on CPAN. <<<< HERE
+    * rename JSON::PPdev into JSON::PP and release on CPAN.
+
+    * Perl 5.14.0 released. This module is a dual-life module. <<<< HERE
 
 --------------------------------------------------------------------------
+
+2.27200  Sun May 22 12:17:51 2011
+	- fixed incr_parse docodeing string more correctly (rt#68032 by LCONS)
 
 2.27105  Tue Mar  8 12:38:42 2011
 	- removed t/900_pod.t from package because of author test

Modified: trunk/libjson-pp-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-pp-perl/MANIFEST?rev=75141&op=diff
==============================================================================
--- trunk/libjson-pp-perl/MANIFEST (original)
+++ trunk/libjson-pp-perl/MANIFEST Sun Jun  5 13:14:51 2011
@@ -39,4 +39,5 @@
 t/113_overloaded_eq.t
 t/114_decode_prefix.t
 t/115_tie_ixhash.t
+t/116_incr_parse_fixed.t
 t/_unicode_handling.pm

Modified: trunk/libjson-pp-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-pp-perl/META.yml?rev=75141&op=diff
==============================================================================
--- trunk/libjson-pp-perl/META.yml (original)
+++ trunk/libjson-pp-perl/META.yml Sun Jun  5 13:14:51 2011
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               JSON-PP
-version:            2.27105
+version:            2.27200
 abstract:           JSON::XS compatible pure-Perl module.
 author:
     - Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt>

Modified: trunk/libjson-pp-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-pp-perl/README?rev=75141&op=diff
==============================================================================
--- trunk/libjson-pp-perl/README (original)
+++ trunk/libjson-pp-perl/README Sun Jun  5 13:14:51 2011
@@ -24,6 +24,8 @@
 
     * rename JSON::PPdev into JSON::PP and release on CPAN.
 
+    * Perl 5.14.0 released. This module is a dual-life module. <<<< HERE
+
 =================
 
 INSTALLATION

Modified: trunk/libjson-pp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-pp-perl/debian/changelog?rev=75141&op=diff
==============================================================================
--- trunk/libjson-pp-perl/debian/changelog (original)
+++ trunk/libjson-pp-perl/debian/changelog Sun Jun  5 13:14:51 2011
@@ -1,9 +1,15 @@
-libjson-pp-perl (2.27105-1) UNRELEASED; urgency=low
+libjson-pp-perl (2.27200-1) UNRELEASED; urgency=low
 
-  IGNORE-VERSION: 2.27105-1
-  New upstream release only removed an author test.
+  [ Ansgar Burchardt ]
+  * New upstream release 2.27105
 
- -- Ansgar Burchardt <ansgar at debian.org>  Fri, 11 Mar 2011 11:16:13 +0100
+  [ Alessandro Ghedini ]
+  * New upstream release
+  * Bump debhelper compat level to 8
+  * Update upstream copyright year
+  * Bump Standards-Version to 3.9.2 (no changes needed)
+
+ -- Alessandro Ghedini <al3xbio at gmail.com>  Sun, 05 Jun 2011 15:07:40 +0200
 
 libjson-pp-perl (2.27104-1) unstable; urgency=low
 

Modified: trunk/libjson-pp-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-pp-perl/debian/compat?rev=75141&op=diff
==============================================================================
--- trunk/libjson-pp-perl/debian/compat (original)
+++ trunk/libjson-pp-perl/debian/compat Sun Jun  5 13:14:51 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: trunk/libjson-pp-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-pp-perl/debian/control?rev=75141&op=diff
==============================================================================
--- trunk/libjson-pp-perl/debian/control (original)
+++ trunk/libjson-pp-perl/debian/control Sun Jun  5 13:14:51 2011
@@ -1,12 +1,12 @@
 Source: libjson-pp-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: perl,
  libtest-pod-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonathan Yu <jawnsy at cpan.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://search.cpan.org/dist/JSON-PP/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libjson-pp-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libjson-pp-perl/

Modified: trunk/libjson-pp-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-pp-perl/debian/copyright?rev=75141&op=diff
==============================================================================
--- trunk/libjson-pp-perl/debian/copyright (original)
+++ trunk/libjson-pp-perl/debian/copyright Sun Jun  5 13:14:51 2011
@@ -4,7 +4,7 @@
 Name: JSON-PP
 
 Files: *
-Copyright: 2005-2010, Makamaka Hannyaharamitu <makamaka at cpan.org>
+Copyright: 2005-2011, Makamaka Hannyaharamitu <makamaka at cpan.org>
 License: Artistic or GPL-1+
 
 Files: debian/*

Modified: trunk/libjson-pp-perl/lib/JSON/PP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-pp-perl/lib/JSON/PP.pm?rev=75141&op=diff
==============================================================================
--- trunk/libjson-pp-perl/lib/JSON/PP.pm (original)
+++ trunk/libjson-pp-perl/lib/JSON/PP.pm Sun Jun  5 13:14:51 2011
@@ -11,7 +11,7 @@
 use B ();
 #use Devel::Peek;
 
-$JSON::PP::VERSION = '2.27105';
+$JSON::PP::VERSION = '2.27200';
 
 @JSON::PP::EXPORT = qw(encode_json decode_json from_json to_json);
 
@@ -1459,7 +1459,7 @@
 
     if ( defined wantarray ) {
 
-        $self->{incr_mode} = INCR_M_WS;
+        $self->{incr_mode} = INCR_M_WS unless defined $self->{incr_mode};
 
         if ( wantarray ) {
             my @ret;
@@ -1470,10 +1470,10 @@
                 push @ret, $self->_incr_parse( $coder, $self->{incr_text} );
 
                 unless ( !$self->{incr_nest} and $self->{incr_mode} == INCR_M_JSON ) {
-                    $self->{incr_mode} = INCR_M_WS;
+                    $self->{incr_mode} = INCR_M_WS if $self->{incr_mode} != INCR_M_STR;
                 }
 
-            } until ( !$self->{incr_text} );
+            } until ( length $self->{incr_text} >= $self->{incr_p} );
 
             $self->{incr_parsing} = 0;
 
@@ -1512,6 +1512,10 @@
         my $s = substr( $text, $p++, 1 );
 
         if ( $s eq '"' ) {
+            if (substr( $text, $p - 2, 1 ) eq '\\' ) {
+                next;
+            }
+
             if ( $self->{incr_mode} != INCR_M_STR  ) {
                 $self->{incr_mode} = INCR_M_STR;
             }
@@ -1545,6 +1549,7 @@
 
     $self->{incr_p} = $p;
 
+    return if ( $self->{incr_mode} == INCR_M_STR and not $self->{incr_nest} );
     return if ( $self->{incr_mode} == INCR_M_JSON and $self->{incr_nest} > 0 );
 
     return '' unless ( length substr( $self->{incr_text}, 0, $p ) );
@@ -1625,9 +1630,9 @@
 
 =head1 VERSION
 
-    2.27105
-
-L<JSON::XS> 2.27 compatible.
+    2.27200
+
+L<JSON::XS> 2.27 (~2.30) compatible.
 
 =head1 NOTE
 
@@ -1826,7 +1831,7 @@
 
 =head2 new
 
-    $json = new JSON::PP
+    $json = JSON::PP->new
 
 Rturns a new JSON::PP object that can be used to de/encode JSON
 strings.
@@ -2804,7 +2809,7 @@
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007-2010 by Makamaka Hannyaharamitu
+Copyright 2007-2011 by Makamaka Hannyaharamitu
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.

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