Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package ruby-libxml This version fixes building against the newer libxml2 in unstable. If that version of libxml2 gets into jessie (it was supposed to), ruby-libxml will instanty become RC-buggy. This version will build in both jessie and unstable. The debdiff against the package in testing is attached. unblock ruby-libxml/2.7.0-3 -- System Information: Debian Release: 8.0 APT prefers buildd-unstable APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=pt_BR.UTF-8, LC_CTYPE=pt_BR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Antonio Terceiro <terceiro@debian.org>
diff -Nru ruby-libxml-2.7.0/debian/changelog ruby-libxml-2.7.0/debian/changelog
--- ruby-libxml-2.7.0/debian/changelog 2013-12-23 18:21:44.000000000 -0200
+++ ruby-libxml-2.7.0/debian/changelog 2014-12-03 21:15:18.000000000 -0200
@@ -1,3 +1,11 @@
+ruby-libxml (2.7.0-3) unstable; urgency=medium
+
+ * Team upload.
+ * debian/patches/libxml2-2.9.2.patch: fix tests when running against libxml2
+ 2.9.2 (Closes: #771217). Thanks to Colin Watson <cjwatson@ubuntu.com>.
+
+ -- Antonio Terceiro <terceiro@debian.org> Wed, 03 Dec 2014 20:30:48 -0200
+
ruby-libxml (2.7.0-2) unstable; urgency=medium
* Team upload.
diff -Nru ruby-libxml-2.7.0/debian/patches/0100_run_builtin_shell_command_ulimit_in_tests.patch ruby-libxml-2.7.0/debian/patches/0100_run_builtin_shell_command_ulimit_in_tests.patch
--- ruby-libxml-2.7.0/debian/patches/0100_run_builtin_shell_command_ulimit_in_tests.patch 2013-08-29 16:17:28.000000000 -0300
+++ ruby-libxml-2.7.0/debian/patches/0100_run_builtin_shell_command_ulimit_in_tests.patch 2014-12-03 20:42:25.000000000 -0200
@@ -7,7 +7,7 @@
--- a/test/tc_parser.rb
+++ b/test/tc_parser.rb
-@@ -246,7 +246,7 @@
+@@ -246,7 +246,7 @@ class TestParser < Test::Unit::TestCase
max_fd = if RUBY_PLATFORM.match(/mswin32|mingw/i)
500
else
diff -Nru ruby-libxml-2.7.0/debian/patches/libxml2-2.9.2.patch ruby-libxml-2.7.0/debian/patches/libxml2-2.9.2.patch
--- ruby-libxml-2.7.0/debian/patches/libxml2-2.9.2.patch 1969-12-31 21:00:00.000000000 -0300
+++ ruby-libxml-2.7.0/debian/patches/libxml2-2.9.2.patch 2014-12-03 20:40:52.000000000 -0200
@@ -0,0 +1,43 @@
+--- a/test/tc_parser.rb
++++ b/test/tc_parser.rb
+@@ -302,7 +302,12 @@ class TestParser < Test::Unit::TestCase
+ assert_nil(error.str2)
+ assert_nil(error.str3)
+ assert_equal(0, error.int1)
+- assert_equal(20, error.int2)
++ # Versions of libxml2 before 2.9.2 calculated wrong error columns.
++ if Gem::Version.new(XML::LIBXML_VERSION) < Gem::Version.new('2.9.2')
++ assert_equal(20, error.int2)
++ else
++ assert_equal(34, error.int2)
++ end
+ assert_nil(error.node)
+ end
+
+--- a/test/tc_html_parser_context.rb
++++ b/test/tc_html_parser_context.rb
+@@ -6,19 +6,22 @@ require 'test/unit'
+
+ class TestHtmlParserContext < Test::Unit::TestCase
+ def test_default_options
++ XML.default_keep_blanks = true
+ context = XML::HTMLParser::Context.new
+ assert_equal(0, context.options)
+ end
+
+ def test_no_options
++ XML.default_keep_blanks = true
+ context = XML::HTMLParser::Context.new
+ context.options = 0
+ assert_equal(0, context.options)
+ end
+
+ def test_options
++ XML.default_keep_blanks = true
+ context = XML::HTMLParser::Context.new
+ context.options = XML::HTMLParser::Options::NOERROR
+ assert_equal(XML::HTMLParser::Options::NOERROR, context.options)
+ end
+-end
+\ No newline at end of file
++end
diff -Nru ruby-libxml-2.7.0/debian/patches/series ruby-libxml-2.7.0/debian/patches/series
--- ruby-libxml-2.7.0/debian/patches/series 2013-08-29 16:17:28.000000000 -0300
+++ ruby-libxml-2.7.0/debian/patches/series 2014-12-03 20:27:46.000000000 -0200
@@ -1,3 +1,4 @@
0100_run_builtin_shell_command_ulimit_in_tests.patch
#fix_test_under_1.9.1
0200_do_not_overwrite_LDFLAGS.patch
+libxml2-2.9.2.patch
Attachment:
signature.asc
Description: Digital signature