[libyaml-libyaml-perl] 01/01: update debian/patches/use-system-yaml.patch

gregor herrmann gregoa at debian.org
Sun Mar 27 18:38:36 UTC 2016


This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch gregoa/use-system-yaml
in repository libyaml-libyaml-perl.

commit f5f4e8b3bea140ac1dd5a6d080aa9b73fdcb1575
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Mar 27 20:37:32 2016 +0200

    update debian/patches/use-system-yaml.patch
    
    patch tests which fail with the system libyaml due to changes in the
    embedded version
    
    also add DEP3 headers
    
    Gbp-Dch: Ignore
---
 debian/patches/use-system-yaml.patch | 93 ++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/debian/patches/use-system-yaml.patch b/debian/patches/use-system-yaml.patch
index 83bb1db..35fed71 100644
--- a/debian/patches/use-system-yaml.patch
+++ b/debian/patches/use-system-yaml.patch
@@ -1,3 +1,13 @@
+Description: use the system libyaml instead of the embedded copy
+ - add -lyaml to LIBS
+ - update tests which probably fail due to changes in the embedded emitter.c
+   (open_ended)
+   patch taken from an older version of the tests
+Origin: vendor
+Forwarded: not needed
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2016-03-27
+
 --- a/LibYAML/Makefile.PL
 +++ b/LibYAML/Makefile.PL
 @@ -24,7 +24,7 @@
@@ -9,3 +19,86 @@
      INC => '-I.',
      OBJECT => $obj_files,
      ABSTRACT_FROM => 'lib/YAML/XS/LibYAML.pm',
+--- a/t/utf8.t
++++ b/t/utf8.t
+@@ -1,7 +1,7 @@
+ use t::TestYAMLTests tests => 8;
+ use utf8;
+ 
+-is Dump("\x{100}"), "--- \xC4\x80\n", 'Dumping wide char works';
++is Dump("\x{100}"), "--- \xC4\x80\n...\n", 'Dumping wide char works';
+ is Load("--- \xC4\x80\n"), "\x{100}", 'Loading UTF-8 works';
+ is Load("\xFE\xFF\0-\0-\0-\0 \x01\x00\0\n"), "\x{100}", 'Loading UTF-16BE works';
+ is Load("\xFF\xFE-\0-\0-\0 \0\x00\x01\n\0"), "\x{100}", 'Loading UTF-16LE works';
+--- a/t/numbers.t
++++ b/t/numbers.t
+@@ -5,12 +5,13 @@
+ my $f = $d + 3;
+ 
+ {
+-is Dump($a, $b, $c, $d), <<'...', "Dumping Integers and Strings";
++is Dump($a, $b, $c, $d), <<'.', "Dumping Integers and Strings";
+ --- 42
+ --- '42'
+ --- 42
+ --- 42
+ ...
++.
+ 
+ my ($num, $float, $str) = Load(<<'...');
+ --- 42
+@@ -29,12 +30,13 @@
+ {
+ local $YAML::XS::QuoteNumericStrings = 1;
+ 
+-is Dump($a, $b, $c, $d), <<'...', "Dumping Integers and Strings";
++is Dump($a, $b, $c, $d), <<'.', "Dumping Integers and Strings";
+ --- 42
+ --- '42'
+ --- 42
+ --- 42
+ ...
++.
+ 
+ my ($num, $float, $str) = Load(<<'...');
+ --- 42
+@@ -53,12 +55,13 @@
+ {
+ local $YAML::XS::QuoteNumericStrings = 0;
+ 
+-is Dump($a, $b, $c, $d), <<'...', "Dumping Integers and Strings";
++is Dump($a, $b, $c, $d), <<'.', "Dumping Integers and Strings";
+ --- 42
+ --- 42
+ --- 42
+ --- 42
+ ...
++.
+ 
+ my ($num, $float, $str) = Load(<<'...');
+ --- 42
+@@ -66,11 +69,12 @@
+ --- '02134'
+ ...
+ 
+-is Dump($num, $float, $str), <<'...', "Round tripping integers and strings";
++is Dump($num, $float, $str), <<'.', "Round tripping integers and strings";
+ --- 42
+ --- 0.333
+ --- 02134
+ ...
++.
+ 
+ }
+ 
+--- a/t/io-handle.t
++++ b/t/io-handle.t
+@@ -41,7 +41,7 @@
+ # read from IO::File handle
+ $fh->open($file, '<') or die $!;
+ my $yaml = do { local $/; <$fh> };
+-is decode_utf8($yaml), "--- $testdata\n", 'LoadFile from IO::File contents is correct';
++is decode_utf8($yaml), "--- $testdata\n...\n", 'LoadFile from IO::File contents is correct';
+ 
+ $fh->seek(0, 0);
+ my $read_data = LoadFile($fh) or die $!;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libyaml-libyaml-perl.git



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