[DRE-commits] [ruby-nokogiri] 04/07: Update patches

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-nokogiri.

commit 09fb588a16dcf98ee2aa9e97461620fe8e1fb0ed
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Nov 3 11:52:11 2013 +0100

    Update patches
    
    - remove-annoying-warning.patch: refreshed
    - fix_tests_assert_match.patch: merged upstream
    - minitest5_support.patch: merged upstream
---
 debian/patches/fix_tests_assert_match.patch  |   40 --------------------------
 debian/patches/minitest5_support.patch       |   19 ------------
 debian/patches/remove-annoying-warning.patch |    8 ++++--
 debian/patches/series                        |    2 --
 4 files changed, 5 insertions(+), 64 deletions(-)

diff --git a/debian/patches/fix_tests_assert_match.patch b/debian/patches/fix_tests_assert_match.patch
deleted file mode 100644
index 31f7761..0000000
--- a/debian/patches/fix_tests_assert_match.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: fix assert_match tests to make them work with minitest gem
- In assert_match of minitest gem, first parameter is converted to Regexp, and
- the second is expected to be a String. Parameters have to be exchanged.
-Author: Cédric Boutillier <boutil at debian.org>
-Bug: https://github.com/sparklemotion/nokogiri/pull/900
-Last-Update: 2013-05-09
-
---- a/test/xml/test_document.rb
-+++ b/test/xml/test_document.rb
-@@ -47,7 +47,7 @@
-         root << txt
-         root << ent
-         d << root
--        assert_match d.to_html, /’/
-+        assert_match /’/, d.to_html
-       end
- 
-       def test_document_with_initial_space
---- a/test/xml/test_entity_reference.rb
-+++ b/test/xml/test_entity_reference.rb
-@@ -26,7 +26,7 @@
-         doc = Nokogiri::XML xml
-         lf_node = Nokogiri::XML::EntityReference.new(doc, "#xa")
-         doc.xpath('/item').first.add_child(lf_node)
--        assert_match doc.to_xml, /&#xa;/
-+        assert_match /&#xa;/, doc.to_xml
-       end
-     end
- 
---- a/test/xml/test_node.rb
-+++ b/test/xml/test_node.rb
-@@ -830,7 +830,7 @@
-         ne = d1.root.xpath('//a').first.dup(1)
-         ne.content += "& < & > \" &"
-         d2.root << ne
--        assert_match d2.to_s, /<a>&& < & > " &<\/a>/
-+        assert_match /<a>&& < & > " &<\/a>/, d2.to_s
-       end
- 
-       def test_content_after_appending_text
diff --git a/debian/patches/minitest5_support.patch b/debian/patches/minitest5_support.patch
deleted file mode 100644
index 02e2353..0000000
--- a/debian/patches/minitest5_support.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Support running tests on Minitest version 5
-Origin: https://github.com/sparklemotion/nokogiri/commit/736896b0c837852fd9074b4c2f3353a237946ff2.patch
-Author: Lee Jarvis <ljjarvis at gmail.com>
-Reviewed-by: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-05-13
-
---- a/test/xslt/test_custom_functions.rb
-+++ b/test/xslt/test_custom_functions.rb
-@@ -63,6 +63,10 @@
-         skip("Pure Java version doesn't support this feature.") if !Nokogiri.uses_libxml?
-         foo = Class.new do
-           include MiniTest::Assertions
-+          # Minitest 5 uses `self.assertions` in `assert()` which is not
-+          # defined in the Minitest::Assertions module :-(
-+          attr_writer :assertions
-+          def assertions; @assertions ||= 0; end
- 
-           def multiarg *args
-             assert_equal ["abc", "xyz"], args
diff --git a/debian/patches/remove-annoying-warning.patch b/debian/patches/remove-annoying-warning.patch
index d346fae..b00b57d 100644
--- a/debian/patches/remove-annoying-warning.patch
+++ b/debian/patches/remove-annoying-warning.patch
@@ -2,9 +2,11 @@ Description: Remove annoying warning about the version of libxml used
 Author: Ryan Niebur <ryanryan52 at gmail.com>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=546843
 Forwarded: not-needed
---- a/lib/nokogiri/version.rb
-+++ b/lib/nokogiri/version.rb
-@@ -28,11 +28,7 @@
+Index: git/lib/nokogiri/version.rb
+===================================================================
+--- git.orig/lib/nokogiri/version.rb	2013-11-03 11:47:24.422149897 +0100
++++ git/lib/nokogiri/version.rb	2013-11-03 11:48:37.348681267 +0100
+@@ -36,11 +36,7 @@
      def warnings
        return [] unless libxml2?
  
diff --git a/debian/patches/series b/debian/patches/series
index 44ad847..6575ba8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 remove-annoying-warning.patch
 no-require-rubygems.patch
-fix_tests_assert_match.patch
-minitest5_support.patch
 skip_test_reader_entity_reference_without_dtdload.patch
 deactivate_test_reader_blocking.patch

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