[SCM] libmessage-passing-perl Debian packaging branch, master, updated. debian/0.111-3-14-g44f6e88

Tomas Doran bobtfish at bobtfish.net
Mon May 6 11:56:58 UTC 2013


The following commit has been merged in the master branch:
commit e398dcdffcfa65b640998a933cd760820537433d
Author: Tomas Doran <bobtfish at bobtfish.net>
Date:   Wed May 23 02:51:14 2012 +0100

    Lose ::XS, it should be silently optional from JSON.pm

diff --git a/Makefile.PL b/Makefile.PL
index 809d1b9..73868e2 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -17,7 +17,6 @@ requires 'MooseX::Types::Common';
 requires 'MooseX::Types::LoadableClass';
 requires 'String::RewritePrefix';
 requires 'JSON';
-requires 'JSON::XS';
 requires 'MooseX::Getopt';
 requires 'Try::Tiny';
 requires 'Task::Weaken';
diff --git a/lib/Log/Stash.pm b/lib/Log/Stash.pm
index d7222ff..1a10d4e 100644
--- a/lib/Log/Stash.pm
+++ b/lib/Log/Stash.pm
@@ -1,6 +1,5 @@
 package Log::Stash;
 use Moose;
-use JSON::XS;
 use Getopt::Long qw(:config pass_through);
 use namespace::autoclean;
 use 5.8.4;
diff --git a/lib/Log/Stash/Types.pm b/lib/Log/Stash/Types.pm
index 616c4f4..130feb8 100644
--- a/lib/Log/Stash/Types.pm
+++ b/lib/Log/Stash/Types.pm
@@ -1,7 +1,7 @@
 package Log::Stash::Types;
 use MooseX::Types ();
 use Moose::Util::TypeConstraints;
-use JSON::XS ();
+use JSON ();
 use MooseX::Types::Common::String qw/ NonEmptySimpleStr /;
 use MooseX::Getopt;
 use Try::Tiny;
@@ -25,7 +25,7 @@ subtype 'Log::Stash::Types::FromJSON',
 
 coerce 'Log::Stash::Types::FromJSON',
   from NonEmptySimpleStr,
-  via { try { JSON::XS->new->relaxed->decode($_) } };
+  via { try { JSON->new->relaxed->decode($_) } };
 
 MooseX::Getopt::OptionTypeMap->add_option_type_to_map(
     'Log::Stash::Types::FromJSON' => '=s'

-- 
libmessage-passing-perl Debian packaging



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