[SCM] Debian packaging of libtest-xml-simple-perl branch, master, updated. f4f0bc08b2e6a41bd6cab01fbae9b46a92609ba6

gregor herrmann gregoa at debian.org
Fri Jun 8 22:37:02 UTC 2012


The following commit has been merged in the master branch:
commit 6274e81e909c029353bf51e40cbfb5b6eb2df805
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Jun 9 00:33:30 2012 +0200

    Drop patches, issues are fixed upstream.

diff --git a/debian/patches/new-test-longstring-output b/debian/patches/new-test-longstring-output
deleted file mode 100644
index 70fa388..0000000
--- a/debian/patches/new-test-longstring-output
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Fix the build with Test-LongString >= 0.15
-Forwarded: http://rt.cpan.org/Public/Display.html?id=65828
-Bug-Debian: http://bugs.debian.org/613740
-Author: Peter Pentchev <roam at ringlet.net>
-Last-Update: 2011-02-17
-
---- a/t/05is.t
-+++ b/t/05is.t
-@@ -1,3 +1,5 @@
-+use version 0.77;
-+
- use Test::Builder::Tester;
- use Test::More tests=>6;
- use Test::XML::Simple;
-@@ -32,24 +34,29 @@
- xml_is_long($xml, "/CATALOG/CD/ARTIST", 'Sting', "full path");
- test_test("long node match");
- 
-+my ($longline, $v1, $v2) = ('');
-+$v1 = version->parse($Test::LongString::VERSION);
-+$v2 = version->parse('0.15');
-+$longline = ' (line 1 column 1)' if ($v1 >= $v2);
-+
- test_out('not ok 1 - good node');
- test_err(qq(#   Failed test 'good node'
--#   at t/05is.t line 43.
-+#   at t/05is.t line 50.
- #          got: "Sting"
- #       length: 5
- #     expected: "Weird Al"
- #       length: 8
--#     strings begin to differ at char 1) );
-+#     strings begin to differ at char 1$longline) );
- xml_is($xml, "//ARTIST", 'Weird Al', "good node");
- test_test("node miss");
- 
- test_out('not ok 1 - full path');
- test_err(qq(#   Failed test 'full path'
--#   at t/05is.t line 54.
-+#   at t/05is.t line 61.
- #          got: "Sting"
- #       length: 5
- #     expected: "Weird Al"
- #       length: 8
--#     strings begin to differ at char 1) );
-+#     strings begin to differ at char 1$longline) );
- xml_is($xml, "/CATALOG/CD/ARTIST", 'Weird Al', "full path");
- test_test("full path miss");
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -11,6 +11,7 @@
-                              Test::More => 0,
-                              Test::LongString => 0,
-                              XML::LibXML => 0,
-+                             version => 0.77,
-                            }, # e.g., Module::Name => 1.1
-     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
-       (ABSTRACT_FROM => 'lib/Test/XML/Simple.pm', 
diff --git a/debian/patches/new-xml-libxml-output b/debian/patches/new-xml-libxml-output
deleted file mode 100644
index 633dd83..0000000
--- a/debian/patches/new-xml-libxml-output
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fix up expected output to match XML::LibXML 1.70
- Note that the trailing whitespace is significant in this patch.
-Forwarded: http://rt.cpan.org/Public/Display.html?id=65828
-Author: Tim Retout <tim at retout.co.uk>
-Bug-Debian: http://bugs.debian.org/555939
-Last-Update: 2011-02-17
-
---- a/t/03valid.t
-+++ b/t/03valid.t
-@@ -34,8 +34,19 @@
- xml_valid($totally_invalid, "invalid xml");
- test_test('non-XML string');
- 
--test_out("not ok 1 - :2: parser error : Premature end of data in tag imatag line 1");
--test_fail(+1);
-+test_out("not ok 1 - :2: parser error : Premature end of data in tag nomatch line 1
-+# 
-+# ^
-+# :2: parser error : Premature end of data in tag imatag line 1
-+# 
-+# ^");
-+test_err("#   Failed test ':2: parser error : Premature end of data in tag nomatch line 1
-+# 
-+# ^
-+# :2: parser error : Premature end of data in tag imatag line 1
-+# 
-+# ^'
-+#   at t/03valid.t line " . line_num(+7) . '.');
- xml_valid($broken_xml, "invalid xml");
- test_test('bad XML');
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cdf46e8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-new-xml-libxml-output
-new-test-longstring-output

-- 
Debian packaging of libtest-xml-simple-perl



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