Author: roam-guest
Date: Thu Feb 17 11:10:07 2011
New Revision: 68874
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68874
Log:
Add the new-test-longstring-output patch to fix the build with
the unstable version of libtest-longstring-perl.
Closes: #613732
Reported by: Dominic Hargreaves <dom at earth.li>
Added:
trunk/libtest-xml-simple-perl/debian/patches/new-test-longstring-output
Modified:
trunk/libtest-xml-simple-perl/debian/changelog
trunk/libtest-xml-simple-perl/debian/patches/series
Modified: trunk/libtest-xml-simple-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-xml-simple-perl/debian/changelog?rev=68874&op=diff
==============================================================================
--- trunk/libtest-xml-simple-perl/debian/changelog (original)
+++ trunk/libtest-xml-simple-perl/debian/changelog Thu Feb 17 11:10:07 2011
@@ -6,7 +6,11 @@
[ Tim Retout ]
* debian/control: Update my email address.
- -- gregor herrmann <gregoa at debian.org> Wed, 28 Jul 2010 14:33:28 -0400
+ [ Peter Pentchev ]
+ * Add the new-test-longstring-output patch to fix the 05is test with
+ a recent version of Test::LongString. Closes: #613732
+
+ -- Peter Pentchev <roam at ringlet.net> Thu, 17 Feb 2011 13:02:48 +0200
libtest-xml-simple-perl (1.00-2) unstable; urgency=low
Added: trunk/libtest-xml-simple-perl/debian/patches/new-test-longstring-output
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-xml-simple-perl/debian/patches/new-test-longstring-output?rev=68874&op=file
==============================================================================
--- trunk/libtest-xml-simple-perl/debian/patches/new-test-longstring-output (added)
+++ trunk/libtest-xml-simple-perl/debian/patches/new-test-longstring-output Thu Feb 17 11:10:07 2011
@@ -1,0 +1,57 @@
+Description: Fix the build with Test-LongString >= 0.15
+Forwarded: no
+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',
Modified: trunk/libtest-xml-simple-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-xml-simple-perl/debian/patches/series?rev=68874&op=diff
==============================================================================
--- trunk/libtest-xml-simple-perl/debian/patches/series (original)
+++ trunk/libtest-xml-simple-perl/debian/patches/series Thu Feb 17 11:10:07 2011
@@ -1,1 +1,2 @@
new-xml-libxml-output
+new-test-longstring-output