r63115 - in /trunk/libyaml-syck-perl: Changes META.yml debian/changelog debian/copyright lib/JSON/Syck.pm lib/YAML/Syck.pm t/3-objects.t

angelabad-guest at users.alioth.debian.org angelabad-guest at users.alioth.debian.org
Thu Sep 30 19:16:56 UTC 2010


Author: angelabad-guest
Date: Thu Sep 30 19:16:42 2010
New Revision: 63115

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=63115
Log:
IGNORE-VERSION: 1.15-1
Only changes in test files

* New upstream release
* debian/copyright: Update license information

Modified:
    trunk/libyaml-syck-perl/Changes
    trunk/libyaml-syck-perl/META.yml
    trunk/libyaml-syck-perl/debian/changelog
    trunk/libyaml-syck-perl/debian/copyright
    trunk/libyaml-syck-perl/lib/JSON/Syck.pm
    trunk/libyaml-syck-perl/lib/YAML/Syck.pm
    trunk/libyaml-syck-perl/t/3-objects.t

Modified: trunk/libyaml-syck-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libyaml-syck-perl/Changes?rev=63115&op=diff
==============================================================================
--- trunk/libyaml-syck-perl/Changes (original)
+++ trunk/libyaml-syck-perl/Changes Thu Sep 30 19:16:42 2010
@@ -1,3 +1,12 @@
+[Changes for 1.15 (YAML::Syck 0.38 ) - 2010-09-23]
+
+* perl RT #78008 - The 5.13.5 development release of perl changed how
+  regexes are stringified, breaking our tests. Update the tests to
+  deal with the new syntax.
+
+  See fb85c04 (http://perl5.git.perl.org/perl.git/commit/fb85c04) in
+  perl.git for context.
+
 [Changes for 1.14 (YAML::Syck 0.37 ) - 2010-08-03]
 * RT RT60771 - Further refactor for JSON. if a number is a valid
   perl string, quote it. "1" + "1" = "11" in javascript.

Modified: trunk/libyaml-syck-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libyaml-syck-perl/META.yml?rev=63115&op=diff
==============================================================================
--- trunk/libyaml-syck-perl/META.yml (original)
+++ trunk/libyaml-syck-perl/META.yml Thu Sep 30 19:16:42 2010
@@ -25,4 +25,4 @@
   homepage: http://search.cpan.org/dist/YAML-Syck
   license: http://opensource.org/licenses/mit-license.php
   repository: http://github.com/avar/YAML-Syck
-version: 1.14
+version: 1.15

Modified: trunk/libyaml-syck-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libyaml-syck-perl/debian/changelog?rev=63115&op=diff
==============================================================================
--- trunk/libyaml-syck-perl/debian/changelog (original)
+++ trunk/libyaml-syck-perl/debian/changelog Thu Sep 30 19:16:42 2010
@@ -1,3 +1,13 @@
+libyaml-syck-perl (1.15-1) UNRELEASED; urgency=low
+
+  IGNORE-VERSION: 1.15-1
+  Only changes in test files
+  
+  * New upstream release
+  * debian/copyright: Update license information
+
+ -- Angel Abad <angelabad at gmail.com>  Thu, 30 Sep 2010 21:15:33 +0200
+
 libyaml-syck-perl (1.14-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libyaml-syck-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libyaml-syck-perl/debian/copyright?rev=63115&op=diff
==============================================================================
--- trunk/libyaml-syck-perl/debian/copyright (original)
+++ trunk/libyaml-syck-perl/debian/copyright Thu Sep 30 19:16:42 2010
@@ -1,25 +1,18 @@
 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Maintainer: Ævar Arnfjörð Bjarmason
+Maintainer: Audrey Tang <cpan at audreyt.org>
 Source: http://search.cpan.org/dist/YAML-Syck/
 Name: YAML-Syck
 
+Files: *
 Copyright: 2005-2009, Audrey Tang <cpan at audreyt.org>
 License: MIT
 
 Files: inc/Test/Builder/IO/Scalar.pm
-Copyright:
- 1996, Eryq
+Copyright: 1996, Eryq
  1999-2001, ZeeGee Software Inc.
 License: Artistic or GPL-1+
 X-Comment:
  See http://search.cpan.org/dist/Test-Simple/lib/Test/Builder/IO/Scalar.pm.
-
-Files: debian/*
-Copyright: 2006, 2007, 2008, Stephen Quinney <sjq at debian.org>
- 2008, AGOSTINI Yves <agostini at univ-metz.fr>
- 2009, Ryan Niebur <ryan at debian.org>
- 2010, gregor herrmann <gregoa at debian.org>
-License: MIT
 
 Files: *.c, *.h
 Copyright: 2003, "why the lucky stiff"
@@ -69,6 +62,15 @@
 Copyright: 2002-2009, chromatic <chromatic at wgz.org> and Michael G Schwern <schwern at pobox.com>
 License: Artistic or GPL-1+
 
+Files: debian/*
+Copyright: 2006, 2007, 2008, Stephen Quinney <sjq at debian.org>
+ 2008, AGOSTINI Yves <agostini at univ-metz.fr>
+ 2009, Ryan Niebur <ryanryan52 at gmail.com>
+ 2010, Angel Abad <angelabad at gmail.com>
+ 2010, Ansgar Burchardt <ansgar at 43-1.org>
+ 2010, gregor herrmann <gregoa at debian.org>
+License: MIT
+
 License: MIT
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation
@@ -94,7 +96,7 @@
  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 systems, the complete text of the Artistic License
+ On Debian GNU/Linux systems, the complete text of the Artistic License
  can be found in `/usr/share/common-licenses/Artistic'.
 
 License: GPL-1+
@@ -103,5 +105,5 @@
  the Free Software Foundation; either version 1, or (at your option)
  any later version.
  .
- On Debian systems, the complete text of version 1 of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-1'.
+ On Debian GNU/Linux systems, the complete text of version 1 of the
+ General Public License can be found in `/usr/share/common-licenses/GPL-1'.

Modified: trunk/libyaml-syck-perl/lib/JSON/Syck.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libyaml-syck-perl/lib/JSON/Syck.pm?rev=63115&op=diff
==============================================================================
--- trunk/libyaml-syck-perl/lib/JSON/Syck.pm (original)
+++ trunk/libyaml-syck-perl/lib/JSON/Syck.pm Thu Sep 30 19:16:42 2010
@@ -5,7 +5,7 @@
 use YAML::Syck ();
 
 BEGIN {
-    $VERSION    = '0.37';
+    $VERSION    = '0.38';
     @EXPORT_OK  = qw( Load Dump LoadFile DumpFile );
     @ISA        = 'Exporter';
     *Load       = \&YAML::Syck::LoadJSON;

Modified: trunk/libyaml-syck-perl/lib/YAML/Syck.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libyaml-syck-perl/lib/YAML/Syck.pm?rev=63115&op=diff
==============================================================================
--- trunk/libyaml-syck-perl/lib/YAML/Syck.pm (original)
+++ trunk/libyaml-syck-perl/lib/YAML/Syck.pm Thu Sep 30 19:16:42 2010
@@ -13,7 +13,7 @@
 use Exporter;
 
 BEGIN {
-    $VERSION = '1.14';
+    $VERSION = '1.15';
     @EXPORT  = qw( Dump Load DumpFile LoadFile );
     @ISA     = qw( Exporter );
 

Modified: trunk/libyaml-syck-perl/t/3-objects.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libyaml-syck-perl/t/3-objects.t?rev=63115&op=diff
==============================================================================
--- trunk/libyaml-syck-perl/t/3-objects.t (original)
+++ trunk/libyaml-syck-perl/t/3-objects.t Thu Sep 30 19:16:42 2010
@@ -1,4 +1,4 @@
-use t::TestYAML tests => 47, (
+use t::TestYAML tests => 48, (
     ($] < 5.008) ? (todo => [19..20, 26..29])
                  : ()
 );
@@ -28,15 +28,32 @@
     !ruby/object:Test::Bear ruby::object:Test::Bear
 ));
 
+
+# perl 5.13.5 and later has fb85c04, which changed the regex
+# stringification syntax. This is also valid.
+use constant REGEX_CARET => qr// =~ /\Q(?^\E/;
+
 my $rx = qr/123/;
-is(Dump($rx), "--- !!perl/regexp (?-xism:123)\n");
-is(Dump(Load(Dump($rx))), "--- !!perl/regexp (?-xism:123)\n");
+if (REGEX_CARET) {
+    ok(1, "Testing regexes with the >=5.13.5 caret syntax");
+    is(Dump($rx), "--- !!perl/regexp (?^:123)\n");
+    is(Dump(Load(Dump($rx))), "--- !!perl/regexp (?^:(?^:123))\n");
+} else {
+    ok(1, "Testing regexes with the old <5.13.5 syntax");
+    is(Dump($rx), "--- !!perl/regexp (?-xism:123)\n");
+    is(Dump(Load(Dump($rx))), "--- !!perl/regexp (?-xism:123)\n");
+}
 
 SKIP: {
     Test::More::skip "5.6 doesn't support printing regexes", 2 if($] < 5.007);
     my $rx_obj = bless qr/123/i => 'Foo';
-    is(Dump($rx_obj), "--- !!perl/regexp:Foo (?i-xsm:123)\n");
-    is(Dump(Load(Dump($rx_obj))), "--- !!perl/regexp:Foo (?i-xsm:123)\n");
+    if (REGEX_CARET) {
+        is(Dump($rx_obj), "--- !!perl/regexp:Foo (?^i:123)\n");
+        is(Dump(Load(Dump($rx_obj))), "--- !!perl/regexp:Foo (?^:(?^i:123))\n");
+    } else {
+        is(Dump($rx_obj), "--- !!perl/regexp:Foo (?i-xsm:123)\n");
+        is(Dump(Load(Dump($rx_obj))), "--- !!perl/regexp:Foo (?i-xsm:123)\n");
+    }
 }
 
 my $obj = bless(\(my $undef) => 'Foo');




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