[DRE-commits] [SCM] ruby-nokogiri.git branch, master, updated. upstream/1.5.0-13-g009b732

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 1215983c3af356edd78bc7edde7aba2c2da3cd6e
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sat May 12 22:47:06 2012 +0200

    add fix-sporadically-failing-tests.patch (closes #661690) + DEP-3 headers for others

diff --git a/debian/patches/fix-sporadically-failing-tests.patch b/debian/patches/fix-sporadically-failing-tests.patch
new file mode 100644
index 0000000..1a89af2
--- /dev/null
+++ b/debian/patches/fix-sporadically-failing-tests.patch
@@ -0,0 +1,31 @@
+Description: Fixing spec that fails sporadically on libxml 2.7.8 and later.
+From: Mike Dalessio <mike at csa.net>
+Bug: https://github.com/tenderlove/nokogiri/issues/626
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661690
+Origin: https://github.com/tenderlove/nokogiri/commit/1ea45940a1ebd78749485d8928d89720db586b3b
+---
+ test/xml/test_document.rb |    8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+
+--- a/test/xml/test_document.rb
++++ b/test/xml/test_document.rb
+@@ -358,13 +358,17 @@
+       def test_subclass_parse
+         klass = Class.new(Nokogiri::XML::Document)
+         doc = klass.parse(File.read(XML_FILE))
+-        assert_equal @xml.to_s, doc.to_s
++        # lame hack uses root to avoid comparing DOCTYPE tags which can appear out of order.
++        # I should really finish lorax and use that here.
++        assert_equal @xml.root.to_s, doc.root.to_s
+         assert_instance_of klass, doc
+       end
+ 
+       def test_document_parse_method
+         xml = Nokogiri::XML::Document.parse(File.read(XML_FILE))
+-        assert_equal @xml.to_s, xml.to_s
++        # lame hack uses root to avoid comparing DOCTYPE tags which can appear out of order.
++        # I should really finish lorax and use that here.
++        assert_equal @xml.root.to_s, xml.root.to_s
+       end
+ 
+       def test_encoding=
diff --git a/debian/patches/no-require-rubygems.dpatch b/debian/patches/no-require-rubygems.dpatch
deleted file mode 100644
index d9d6aad..0000000
--- a/debian/patches/no-require-rubygems.dpatch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/bin/nokogiri
-+++ b/bin/nokogiri
-@@ -3,7 +3,6 @@ require 'optparse'
- require 'open-uri'
- require 'irb'
- require 'uri'
--require 'rubygems'
- require 'nokogiri'
- 
- parse_class = Nokogiri
diff --git a/debian/patches/no-require-rubygems.patch b/debian/patches/no-require-rubygems.patch
new file mode 100644
index 0000000..7b9fa95
--- /dev/null
+++ b/debian/patches/no-require-rubygems.patch
@@ -0,0 +1,14 @@
+Description: Remove requirement on rubygems
+Origine: vendor
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/bin/nokogiri
++++ b/bin/nokogiri
+@@ -3,7 +3,6 @@
+ require 'open-uri'
+ require 'irb'
+ require 'uri'
+-require 'rubygems'
+ require 'nokogiri'
+ 
+ parse_class = Nokogiri
diff --git a/debian/patches/remove-annoying-warning.patch b/debian/patches/remove-annoying-warning.patch
index 282b4fe..f58ddd1 100644
--- a/debian/patches/remove-annoying-warning.patch
+++ b/debian/patches/remove-annoying-warning.patch
@@ -1,5 +1,7 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=546843
-
+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 @@ module Nokogiri
diff --git a/debian/patches/series b/debian/patches/series
index f362509..673598b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove-annoying-warning.patch
-no-require-rubygems.dpatch
+no-require-rubygems.patch
+fix-sporadically-failing-tests.patch

-- 
ruby-nokogiri.git