[DRE-commits] [ruby-libxml] 05/07: Drop libxml2-2.9.2.patch

[Cédric Boutillier]

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

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

commit b4a67fd286dd0e82ee8267b95a6f77d039a2b391
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Jul 2 21:02:45 2016 +0200

    Drop libxml2-2.9.2.patch
---
 debian/patches/libxml2-2.9.2.patch | 48 --------------------------------------
 debian/patches/series              |  1 -
 2 files changed, 49 deletions(-)

diff --git a/debian/patches/libxml2-2.9.2.patch b/debian/patches/libxml2-2.9.2.patch
deleted file mode 100644
index ee2daa7..0000000
--- a/debian/patches/libxml2-2.9.2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: fix tests when running with libxml2 2.9.2
-Author: Colin Watson <cjwatson at ubuntu.com>
-Bug-Debian: https://bugs.debian.org/771217
-Last-Update: 2014-11-27
-
---- 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 d763a45..1e3c72c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-libxml2-2.9.2.patch
 avoid_infinite_loop_ruby22.patch
 avoid_messing_with_loadpath.patch
 broken_tests.patch

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