r45900 - in /trunk/libjson-perl: Changes MANIFEST META.yml README debian/changelog debian/control debian/copyright debian/rules lib/JSON.pm lib/JSON/PP.pm lib/JSON/PP58.pm t/01_utf8.t t/04_pretty.t t/06_pc_pretty.t t/xe05_indent_length.t
angelabad-guest at users.alioth.debian.org
angelabad-guest at users.alioth.debian.org
Sat Oct 17 09:35:14 UTC 2009
Author: angelabad-guest
Date: Sat Oct 17 09:34:52 2009
New Revision: 45900
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=45900
Log:
New upstream 2.16
Removed:
trunk/libjson-perl/t/04_pretty.t
Modified:
trunk/libjson-perl/Changes
trunk/libjson-perl/MANIFEST
trunk/libjson-perl/META.yml
trunk/libjson-perl/README
trunk/libjson-perl/debian/changelog
trunk/libjson-perl/debian/control
trunk/libjson-perl/debian/copyright
trunk/libjson-perl/debian/rules
trunk/libjson-perl/lib/JSON.pm
trunk/libjson-perl/lib/JSON/PP.pm
trunk/libjson-perl/lib/JSON/PP58.pm
trunk/libjson-perl/t/01_utf8.t
trunk/libjson-perl/t/06_pc_pretty.t
trunk/libjson-perl/t/xe05_indent_length.t
Modified: trunk/libjson-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/Changes?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/Changes (original)
+++ trunk/libjson-perl/Changes Sat Oct 17 09:34:52 2009
@@ -12,6 +12,12 @@
Please check JSON::RPC (supports JSON-RPC protocol v1.1 and 1.0).
##########################################################################
+
+2.16 Fri Oct 16 15:07:37 2009
+ [JSON][JSON::PP]
+ - made compatible with JSON::XS 2.26
+ *indent adds a final newline
+ - corrected copyrights in JSON::PP58.
2.15 Tue Jun 2 16:36:42 2009
[JSON]
Modified: trunk/libjson-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/MANIFEST?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/MANIFEST (original)
+++ trunk/libjson-perl/MANIFEST Sat Oct 17 09:34:52 2009
@@ -15,7 +15,6 @@
t/01_utf8.t
t/02_error.t
t/03_types.t
-t/04_pretty.t
t/06_pc_pretty.t
t/07_pc_esc.t
t/08_pc_base.t
Modified: trunk/libjson-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/META.yml?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/META.yml (original)
+++ trunk/libjson-perl/META.yml Sat Oct 17 09:34:52 2009
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: JSON
-version: 2.15
+version: 2.16
abstract: JSON (JavaScript Object Notation) encoder/decoder
author:
- Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt>
Modified: trunk/libjson-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/README?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/README (original)
+++ trunk/libjson-perl/README Sat Oct 17 09:34:52 2009
@@ -1,4 +1,4 @@
-JSON version 2.15
+JSON version 2.16
=================
INSTALLATION
@@ -42,9 +42,9 @@
use JSON -support_by_pp;
VERSION
- 2.13
-
- This version is compatible with JSON::XS 2.21.
+ 2.16
+
+ This version is compatible with JSON::XS 2.26 and later.
DESCRIPTION
************************** CAUTION ********************************
@@ -681,8 +681,9 @@
to a hash or array) to its JSON representation. Simple scalars will be
converted into JSON string or number sequences, while references to
arrays become JSON arrays and references to hashes become JSON objects.
- Undefined Perl values (e.g. "undef") become JSON "null" values. Neither
- "true" nor "false" values will be generated.
+ Undefined Perl values (e.g. "undef") become JSON "null" values.
+ References to the integers 0 and 1 are converted into "true" and
+ "false".
decode
$perl_scalar = $json->decode($json_text)
@@ -691,8 +692,9 @@
returning the resulting simple scalar or reference. Croaks on error.
JSON numbers and strings become simple Perl scalars. JSON arrays become
- Perl arrayrefs and JSON objects become Perl hashrefs. "true" becomes 1,
- "false" becomes 0 and "null" becomes "undef".
+ Perl arrayrefs and JSON objects become Perl hashrefs. "true" becomes 1
+ ("JSON::true"), "false" becomes 0 ("JSON::false") and "null" becomes
+ "undef".
decode_prefix
($perl_scalar, $characters) = $json->decode_prefix($json_text)
@@ -1077,6 +1079,9 @@
converts "Math::BigInt" objects and "Math::BigFloat" objects into
JSON numbers.
+JSON and ECMAscript
+ See to "JSON and ECMAscript" in JSON::XS.
+
JSON and YAML
JSON is not a subset of YAML. See to "JSON and YAML" in JSON::XS.
@@ -1140,7 +1145,7 @@
makes a part of those unupported methods available. This feature is
achieved by using JSON::PP in "de/encode".
- BEING { $ENV{PERL_JSON_BACKEND} = 2 } # with JSON::XS
+ BEGIN { $ENV{PERL_JSON_BACKEND} = 2 } # with JSON::XS
use JSON -support_by_pp;
my $json = new JSON;
$json->allow_nonref->escape_slash->encode("/");
@@ -1365,7 +1370,7 @@
The relese of this new version owes to the courtesy of Marc Lehmann.
COPYRIGHT AND LICENSE
- Copyright 2005-2008 by Makamaka Hannyaharamitu
+ Copyright 2005-2009 by Makamaka Hannyaharamitu
This library is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libjson-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/debian/changelog?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/debian/changelog (original)
+++ trunk/libjson-perl/debian/changelog Sat Oct 17 09:34:52 2009
@@ -1,8 +1,17 @@
-libjson-perl (2.15-2) UNRELEASED; urgency=low
+libjson-perl (2.16-1) unstable; urgency=low
+ [ Nathan Handler ]
* debian/watch: Update to ignore development releases.
+
+ [ Angel Abad ]
+ * New upstream release
+ * Update my email address
+ * debian/control: Changed: Replace versioned (build-)dependency on
+ perl (>= 5.6.0-{12,16}) with an unversioned dependency on perl (as
+ permitted by Debian Policy 3.8.3)
+ * Standards-Version: 3.8.3
- -- Nathan Handler <nhandler at ubuntu.com> Sat, 06 Jun 2009 01:34:41 +0000
+ -- Angel Abad <angelabad at gmail.com> Sat, 17 Oct 2009 11:29:27 +0200
libjson-perl (2.15-1) unstable; urgency=low
Modified: trunk/libjson-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/debian/control?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/debian/control (original)
+++ trunk/libjson-perl/debian/control Sat Oct 17 09:34:52 2009
@@ -2,21 +2,20 @@
Section: perl
Priority: optional
Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl (>= 5.8.0-7), libtest-pod-perl (>= 1.00),
- libjson-xs-perl (>= 2.24)
+Build-Depends-Indep: libjson-xs-perl (>= 2.24), libtest-pod-perl (>= 1.00),
+ perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Angel Abad (Ikusnet SLL) <angel at grupoikusnet.com>,
+Uploaders: Angel Abad <angelabad at gmail.com>,
Ivan Kohler <ivan-debian at 420.am>,
- Ansgar Burchardt <ansgar at 43-1.org>,
- Nathan Handler <nhandler at ubuntu.com>
-Standards-Version: 3.8.1
+ Ansgar Burchardt <ansgar at 43-1.org>, Nathan Handler <nhandler at ubuntu.com>
+Standards-Version: 3.8.3
Homepage: http://search.cpan.org/dist/JSON/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libjson-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libjson-perl/
Package: libjson-perl
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}
Recommends: libjson-xs-perl (>= 2.24)
Description: Perl module to parse and convert to JSON
This module converts JSON (JavaScript Object Notation) and Perl
Modified: trunk/libjson-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/debian/copyright?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/debian/copyright (original)
+++ trunk/libjson-perl/debian/copyright Sat Oct 17 09:34:52 2009
@@ -1,25 +1,27 @@
Format-Specification:
http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Makamaka Hannyaharamitu <makamaka at cpan.org>
-Upstream-Source: http://search.cpan.org/dist/JSON
+Upstream-Maintainer: Makamaka Hannyaharamitu, <makamaka at cpan.org>
+Upstream-Source: http://search.cpan.org/dist/JSON/
Upstream-Name: JSON
Files: *
-Copyright: Copyright 2005-2009, Makamaka Hannyaharamitu <makamaka at cpan.org>
+Copyright: 2005-2009, Makamaka Hannyaharamitu <makamaka at cpan.org>
License-Alias: Perl
License: Artistic | GPL-1+
Files: debian/*
-Copyright: Copyright 2005-2009, Ivan Kohler <ivan-debian at 420.am>
- Copyright: Copyright 2009, Angel Abad (Iksnet SLL) <angel at grupoikusnet.com>
-License-Alias: Perl
+Copyright: 2005, 2007, 2008, Ivan Kohler <ivan-debian at 420.am>
+ 2008, 2009, Angel Abad (Ikusnet SLL) <angel at grupoikusnet.com>
+ 2009, Angel Abad <angelabad at gmail.com>
+ 2009, Ansgar Burchardt <ansgar at 43-1.org>
+ 2009, Nathan Handler <nhandler at ubuntu.com>
License: Artistic | GPL-1+
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
+ can be found in `/usr/share/common-licenses/Artistic'
License: GPL-1+
This program is free software; you can redistribute it and/or modify
Modified: trunk/libjson-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/debian/rules?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/debian/rules (original)
+++ trunk/libjson-perl/debian/rules Sat Oct 17 09:34:52 2009
@@ -1,23 +1,4 @@
#!/usr/bin/make -f
-build: build-stamp
-build-stamp:
- dh build
- touch $@
-
-clean:
+%:
dh $@
-
-install: install-stamp
-install-stamp: build-stamp
- dh install
- touch $@
-
-binary-arch:
-
-binary-indep: install
- dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
Modified: trunk/libjson-perl/lib/JSON.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/lib/JSON.pm?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/lib/JSON.pm (original)
+++ trunk/libjson-perl/lib/JSON.pm Sat Oct 17 09:34:52 2009
@@ -7,13 +7,13 @@
@JSON::EXPORT = qw(from_json to_json jsonToObj objToJson encode_json decode_json);
BEGIN {
- $JSON::VERSION = '2.15';
+ $JSON::VERSION = '2.16';
$JSON::DEBUG = 0 unless (defined $JSON::DEBUG);
}
my $Module_XS = 'JSON::XS';
my $Module_PP = 'JSON::PP';
-my $XS_Version = '2.24';
+my $XS_Version = '2.26';
# XS and PP common methods
@@ -586,9 +586,9 @@
=head1 VERSION
- 2.15
-
-This version is compatible with JSON::XS B<2.24> and later.
+ 2.16
+
+This version is compatible with JSON::XS B<2.26> and later.
=head1 DESCRIPTION
Modified: trunk/libjson-perl/lib/JSON/PP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/lib/JSON/PP.pm?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/lib/JSON/PP.pm (original)
+++ trunk/libjson-perl/lib/JSON/PP.pm Sat Oct 17 09:34:52 2009
@@ -11,7 +11,7 @@
use B ();
#use Devel::Peek;
-$JSON::PP::VERSION = '2.24000';
+$JSON::PP::VERSION = '2.26000';
@JSON::PP::EXPORT = qw(encode_json decode_json from_json to_json);
@@ -291,6 +291,8 @@
if(!ref $obj and !$idx->[ P_ALLOW_NONREF ]);
my $str = $self->object_to_json($obj);
+
+ $str .= "\n" if ( $indent ); # JSON::XS 2.26 compatible
unless ($ascii or $latin1 or $utf8) {
utf8::upgrade($str);
Modified: trunk/libjson-perl/lib/JSON/PP58.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/lib/JSON/PP58.pm?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/lib/JSON/PP58.pm (original)
+++ trunk/libjson-perl/lib/JSON/PP58.pm Sat Oct 17 09:34:52 2009
@@ -5,7 +5,7 @@
my @properties;
-$JSON::PP58::VERSION = '1.02';
+$JSON::PP58::VERSION = '1.03';
BEGIN {
@@ -84,7 +84,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright 2008 by Makamaka Hannyaharamitu
+Copyright 2008-2009 by Makamaka Hannyaharamitu
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
Modified: trunk/libjson-perl/t/01_utf8.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/t/01_utf8.t?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/t/01_utf8.t (original)
+++ trunk/libjson-perl/t/01_utf8.t Sat Oct 17 09:34:52 2009
@@ -23,8 +23,8 @@
skip "UNICODE handling is disabale.", 7 unless $JSON::can_handle_UTF16_and_utf8;
ok (JSON->new->allow_nonref (1)->ascii (1)->utf8 (1)->encode (chr 0x8000) eq '"\u8000"');
-ok (JSON->new->allow_nonref (1)->ascii (1)->utf8 (1)->pretty (1)->encode (chr 0x10402) eq '"\ud801\udc02"');
-#print JSON->new->allow_nonref (1)->ascii (1)->utf8 (1)->pretty (1)->encode (chr 0x12345), "\n";
+ok (JSON->new->allow_nonref (1)->ascii (1)->utf8 (1)->pretty (1)->encode (chr 0x10402) eq "\"\\ud801\\udc02\"\n");
+
eval { JSON->new->allow_nonref (1)->utf8 (1)->decode ('"ü"') };
ok $@ =~ /malformed UTF-8/;
Modified: trunk/libjson-perl/t/06_pc_pretty.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/t/06_pc_pretty.t?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/t/06_pc_pretty.t (original)
+++ trunk/libjson-perl/t/06_pc_pretty.t Sat Oct 17 09:34:52 2009
@@ -27,7 +27,8 @@
{
"foo" : "bar"
}
-]|);
+]
+|);
$obj = { foo => [ {a=>"b"}, 0, 1, 2 ] };
$pc->pretty(0);
@@ -47,7 +48,8 @@
1,
2
]
-}|);
+}
+|);
$obj = { foo => [ {a=>"b"}, 0, 1, 2 ] };
$pc->pretty(0);
@@ -57,11 +59,11 @@
$obj = {foo => "bar"};
$pc->indent(3); # original -- $pc->indent(1);
-is($pc->encode($obj), qq|{\n "foo":"bar"\n}|, "nospace");
+is($pc->encode($obj), qq|{\n "foo":"bar"\n}\n|, "nospace");
$pc->space_after(1);
-is($pc->encode($obj), qq|{\n "foo": "bar"\n}|, "after");
+is($pc->encode($obj), qq|{\n "foo": "bar"\n}\n|, "after");
$pc->space_before(1);
-is($pc->encode($obj), qq|{\n "foo" : "bar"\n}|, "both");
+is($pc->encode($obj), qq|{\n "foo" : "bar"\n}\n|, "both");
$pc->space_after(0);
-is($pc->encode($obj), qq|{\n "foo" :"bar"\n}|, "before");
+is($pc->encode($obj), qq|{\n "foo" :"bar"\n}\n|, "before");
Modified: trunk/libjson-perl/t/xe05_indent_length.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libjson-perl/t/xe05_indent_length.t?rev=45900&op=diff
==============================================================================
--- trunk/libjson-perl/t/xe05_indent_length.t (original)
+++ trunk/libjson-perl/t/xe05_indent_length.t Sat Oct 17 09:34:52 2009
@@ -21,7 +21,8 @@
},
"1",
"/"
-]|);
+]
+|);
is($json->escape_slash(1)->pretty->indent_length(2)->encode([1,{foo => 'bar'}, "1", "/"]), qq|[
@@ -31,7 +32,8 @@
},
"1",
"\\/"
-]|);
+]
+|);
is($json->escape_slash(1)->pretty->indent_length(3)->encode([1,{foo => 'bar'}, "1", "/"]), qq|[
@@ -41,7 +43,8 @@
},
"1",
"\\/"
-]|);
+]
+|);
is($json->escape_slash(1)->pretty->indent_length(15)->encode([1,{foo => 'bar'}, "1", "/"]), qq|[
1,
@@ -50,7 +53,8 @@
},
"1",
"\\/"
-]|);
+]
+|);
is($json->indent_length(0)->encode([1,{foo => 'bar'}, "1", "/"]), qq|[
@@ -60,7 +64,8 @@
},
"1",
"\\/"
-]|);
+]
+|);
is($json->indent(0)->space_before(0)->space_after(0)->escape_slash(0)
->encode([1,{foo => 'bar'}, "1", "/"]), qq|[1,{"foo":"bar"},"1","/"]|);
More information about the Pkg-perl-cvs-commits
mailing list