tags 577355 patch
thanks

Hi,

 upstream fixes this FTBFS issue in its git repo.
 Please apply attached patch, that is stolen from git.
 Thanks.

-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/org
 http://wiki.debian.org/HidekiYamane
diff -u libnokogiri-ruby-1.4.0/debian/changelog libnokogiri-ruby-1.4.0/debian/changelog
--- libnokogiri-ruby-1.4.0/debian/changelog
+++ libnokogiri-ruby-1.4.0/debian/changelog
@@ -1,3 +1,12 @@
+libnokogiri-ruby (1.4.0-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches
+    - add fix-test_element_description.rb.patch from upstream git to fix
+     FTBFS (Closes: #577355)
+
+ -- Hideki Yamane (Debian-JP) <henr...@debian.or.jp>  Mon, 05 Jul 2010 18:05:12 +0900
+
 libnokogiri-ruby (1.4.0-3) unstable; urgency=low
 
   * Fix test to also work in UTC. Closes: #566055.
diff -u libnokogiri-ruby-1.4.0/debian/patches/series libnokogiri-ruby-1.4.0/debian/patches/series
--- libnokogiri-ruby-1.4.0/debian/patches/series
+++ libnokogiri-ruby-1.4.0/debian/patches/series
@@ -1,3 +1,4 @@
+fix-test_element_description.rb.patch
 fix-patch-for-utc-timezone.patch
 get-rid-of-annoying-warning.patch
 disable-rubygems.patch
only in patch2:
unchanged:
--- libnokogiri-ruby-1.4.0.orig/debian/patches/fix-test_element_description.rb.patch
+++ libnokogiri-ruby-1.4.0/debian/patches/fix-test_element_description.rb.patch
@@ -0,0 +1,19 @@
+Index: libnokogiri-ruby-1.4.0/test/html/test_element_description.rb
+===================================================================
+--- libnokogiri-ruby-1.4.0.orig/test/html/test_element_description.rb	2010-07-05 18:04:20.060179175 +0900
++++ libnokogiri-ruby-1.4.0/test/html/test_element_description.rb	2010-07-05 18:04:52.548175238 +0900
+@@ -56,7 +56,13 @@
+ 
+       def test_subelements
+         sub_elements = ElementDescription['body'].sub_elements
+-        assert_equal 61, sub_elements.length
++        if Nokogiri.uses_libxml? && Nokogiri::LIBXML_VERSION == '2.7.7'
++          assert_equal 65, sub_elements.length
++        elsif Nokogiri.uses_libxml?
++          assert_equal 61, sub_elements.length
++        else
++          assert sub_elements.length > 0
++        end
+       end
+ 
+       def test_default_sub_element

Reply via email to