[DRE-commits] [ruby-libxml] 01/01: Imported Debian patch 2.7.0-3

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-libxml.

commit e49995a8359b3ade2c39d6cf81b59eaa28ccd33f
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Dec 3 20:30:48 2014 -0200

    Imported Debian patch 2.7.0-3
---
 debian/changelog                                   |  8 ++++
 ...run_builtin_shell_command_ulimit_in_tests.patch |  2 +-
 debian/patches/libxml2-2.9.2.patch                 | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/source/local-options                        |  1 -
 5 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a394591..83bff94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at ubuntu.com>.
+
+ -- Antonio Terceiro <terceiro at debian.org>  Wed, 03 Dec 2014 20:30:48 -0200
+
 ruby-libxml (2.7.0-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0100_run_builtin_shell_command_ulimit_in_tests.patch b/debian/patches/0100_run_builtin_shell_command_ulimit_in_tests.patch
index 5ba2399..1f3734e 100644
--- a/debian/patches/0100_run_builtin_shell_command_ulimit_in_tests.patch
+++ b/debian/patches/0100_run_builtin_shell_command_ulimit_in_tests.patch
@@ -7,7 +7,7 @@ Last-Update:2013-08-19
 
 --- 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 --git a/debian/patches/libxml2-2.9.2.patch b/debian/patches/libxml2-2.9.2.patch
new file mode 100644
index 0000000..a37db77
--- /dev/null
+++ b/debian/patches/libxml2-2.9.2.patch
@@ -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 --git a/debian/patches/series b/debian/patches/series
index eb39b8b..c8fa637 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-libxml.git