r11540 - in /trunk/libjson-any-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/JSON/ t/
gwolf at users.alioth.debian.org
gwolf at users.alioth.debian.org
Sun Dec 23 19:50:22 UTC 2007
Author: gwolf
Date: Sun Dec 23 19:50:22 2007
New Revision: 11540
URL: http://svn.debian.org/wsvn/?sc=1&rev=11540
Log:
New upstream version ready for us... But still waiting for
libjson-perl 2.0 to be uploadded :-/
Removed:
trunk/libjson-any-perl/t/kwalitee.t
trunk/libjson-any-perl/t/pod-coverage.t
trunk/libjson-any-perl/t/pod.t
Modified:
trunk/libjson-any-perl/Changes
trunk/libjson-any-perl/MANIFEST
trunk/libjson-any-perl/META.yml
trunk/libjson-any-perl/Makefile.PL
trunk/libjson-any-perl/debian/changelog
trunk/libjson-any-perl/inc/Module/Install.pm
trunk/libjson-any-perl/inc/Module/Install/AutoInstall.pm
trunk/libjson-any-perl/inc/Module/Install/Base.pm
trunk/libjson-any-perl/inc/Module/Install/Can.pm
trunk/libjson-any-perl/inc/Module/Install/Fetch.pm
trunk/libjson-any-perl/inc/Module/Install/Include.pm
trunk/libjson-any-perl/inc/Module/Install/Makefile.pm
trunk/libjson-any-perl/inc/Module/Install/Metadata.pm
trunk/libjson-any-perl/inc/Module/Install/Win32.pm
trunk/libjson-any-perl/inc/Module/Install/WriteAll.pm
trunk/libjson-any-perl/lib/JSON/Any.pm
Modified: trunk/libjson-any-perl/Changes
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/Changes?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/Changes (original)
+++ trunk/libjson-any-perl/Changes Sun Dec 23 19:50:22 2007
@@ -1,7 +1,10 @@
Revision history for JSON-Any
+1.14 ???
+ * Fix for the new JSON/JSON::XS 2.0
+ *** THIS UPGRADE WILL ONLY WORK ON 2.0+ VERSIONS OF THESE MODULES ***
1.13 2007-11-06
* Fix 10_unicode.t to skip_all if no supported unicode backend is found
- (reported by Andreas König)
+ (reported by Andreas König)
1.12 2007-10-22
* Fix issue with 05-JSON-Syck.t so we can pass our tests again
Modified: trunk/libjson-any-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/MANIFEST?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/MANIFEST (original)
+++ trunk/libjson-any-perl/MANIFEST Sun Dec 23 19:50:22 2007
@@ -22,6 +22,3 @@
t/04-ENV.t
t/05-JSON-Syck.t
t/10_unicode.t
-t/kwalitee.t
-t/pod-coverage.t
-t/pod.t
Modified: trunk/libjson-any-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/META.yml?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/META.yml (original)
+++ trunk/libjson-any-perl/META.yml Sun Dec 23 19:50:22 2007
@@ -1,10 +1,11 @@
---
abstract: Wrapper Class for the various JSON classes.
-author: Chris Thompson, C<< <cthom at cpan.org> >>
+author:
+ - Chris Thompson, C<< <cthom at cpan.org> >>
build_requires:
Test::More: 0
distribution_type: module
-generated_by: Module::Install version 0.67
+generated_by: Module::Install version 0.68
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.3.html
@@ -17,4 +18,4 @@
- t
requires:
Carp: 0
-version: 1.13
+version: 1.14
Modified: trunk/libjson-any-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/Makefile.PL?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/Makefile.PL (original)
+++ trunk/libjson-any-perl/Makefile.PL Sun Dec 23 19:50:22 2007
@@ -10,11 +10,11 @@
feature 'JSON',
-default => 1,
- 'JSON' => '0';
+ 'JSON' => '2.01';
feature 'JSON::XS',
-default => 0,
- 'JSON::XS' => '0';
+ 'JSON::XS' => '2.01';
feature 'JSON::PC',
-default => 0,
@@ -32,5 +32,10 @@
build_requires 'Test::More' => '0';
no_index 'directory' => 'ex';
+if ( $ENV{BUILD_STANDARD_TESTS} ) {
+ use_test_base;
+ use_standard_tests;
+}
+
auto_install;
WriteAll;
Modified: trunk/libjson-any-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/debian/changelog?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/debian/changelog (original)
+++ trunk/libjson-any-perl/debian/changelog Sun Dec 23 19:50:22 2007
@@ -1,3 +1,11 @@
+libjson-any-perl (1.14-1) UNRELEASED; urgency=low
+
+ [ Waiting for JSON 2.0 to be uploaded ]
+
+ * (NOT RELEASED YET) New upstream release
+
+ -- Gunnar Wolf <gwolf at debian.org> Sun, 23 Dec 2007 13:43:44 -0600
+
libjson-any-perl (1.13-1) unstable; urgency=low
[ gregor herrmann ]
Modified: trunk/libjson-any-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/inc/Module/Install.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/inc/Module/Install.pm (original)
+++ trunk/libjson-any-perl/inc/Module/Install.pm Sun Dec 23 19:50:22 2007
@@ -28,7 +28,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '0.67';
+ $VERSION = '0.68';
}
# Whether or not inc::Module::Install is actually loaded, the
Modified: trunk/libjson-any-perl/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/inc/Module/Install/AutoInstall.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/inc/Module/Install/AutoInstall.pm (original)
+++ trunk/libjson-any-perl/inc/Module/Install/AutoInstall.pm Sun Dec 23 19:50:22 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libjson-any-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/inc/Module/Install/Base.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libjson-any-perl/inc/Module/Install/Base.pm Sun Dec 23 19:50:22 2007
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.67';
+$VERSION = '0.68';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: trunk/libjson-any-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/inc/Module/Install/Can.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libjson-any-perl/inc/Module/Install/Can.pm Sun Dec 23 19:50:22 2007
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libjson-any-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/inc/Module/Install/Fetch.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libjson-any-perl/inc/Module/Install/Fetch.pm Sun Dec 23 19:50:22 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libjson-any-perl/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/inc/Module/Install/Include.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/inc/Module/Install/Include.pm (original)
+++ trunk/libjson-any-perl/inc/Module/Install/Include.pm Sun Dec 23 19:50:22 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libjson-any-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/inc/Module/Install/Makefile.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libjson-any-perl/inc/Module/Install/Makefile.pm Sun Dec 23 19:50:22 2007
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libjson-any-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/inc/Module/Install/Metadata.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libjson-any-perl/inc/Module/Install/Metadata.pm Sun Dec 23 19:50:22 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libjson-any-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/inc/Module/Install/Win32.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libjson-any-perl/inc/Module/Install/Win32.pm Sun Dec 23 19:50:22 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libjson-any-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/inc/Module/Install/WriteAll.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libjson-any-perl/inc/Module/Install/WriteAll.pm Sun Dec 23 19:50:22 2007
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.67';
+ $VERSION = '0.68';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libjson-any-perl/lib/JSON/Any.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/lib/JSON/Any.pm?rev=11540&op=diff
==============================================================================
--- trunk/libjson-any-perl/lib/JSON/Any.pm (original)
+++ trunk/libjson-any-perl/lib/JSON/Any.pm Sun Dec 23 19:50:22 2007
@@ -1,6 +1,6 @@
##############################################################################
# JSON::Any
-# v1.13
+# v1.14
# Copyright (c) 2007 Chris Thompson
##############################################################################
@@ -16,11 +16,11 @@
=head1 VERSION
-Version 1.13
-
-=cut
-
-our $VERSION = '1.13';
+Version 1.14
+
+=cut
+
+our $VERSION = '1.14';
our $UTF8;
@@ -33,9 +33,12 @@
BEGIN {
%conf = (
json => {
- encoder => 'objToJson',
- decoder => 'jsonToObj',
+ encoder => 'encode_json',
+ decoder => 'decode_json',
create_object => sub {
+ require utf8;
+ utf8->import();
+
my ( $self, $conf ) = @_;
my @params = qw(
autoconv
@@ -50,10 +53,16 @@
singlequote
utf8
);
- $self->[ENCODER] = 'objToJson';
- $self->[DECODER] = 'jsonToObj';
- $self->[HANDLER] =
- $handler->new( map { $_ => $conf->{$_} } @params );
+ local $conf->{utf8} = !$conf->{utf8}; # it means the opposite
+ my $obj = $handler->new;
+ for my $mutator (@params) {
+ next unless exists $conf->{$mutator};
+ $obj = $obj->$mutator( $conf->{$mutator} );
+ }
+
+ $self->[ENCODER] = 'encode';
+ $self->[DECODER] = 'decode';
+ $self->[HANDLER] = $obj;
},
},
@@ -72,8 +81,8 @@
},
json_xs => {
- encoder => 'to_json',
- decoder => 'from_json',
+ encoder => 'encode_json',
+ decoder => 'decode_json',
create_object => sub {
require utf8;
utf8->import();
More information about the Pkg-perl-cvs-commits
mailing list