[DRE-commits] r5983 - in trunk/libnokogiri-ruby/debian: . patches

[Ryan Niebur]

Author: ryan
Date: 2010-12-14 04:16:12 +0000 (Tue, 14 Dec 2010)
New Revision: 5983

Added:
   trunk/libnokogiri-ruby/debian/patches/fix-test_element_description.rb.patch
Modified:
   trunk/libnokogiri-ruby/debian/changelog
   trunk/libnokogiri-ruby/debian/patches/series
Log:
commit nmu by henrich

Modified: trunk/libnokogiri-ruby/debian/changelog
===================================================================
--- trunk/libnokogiri-ruby/debian/changelog	2010-11-28 21:34:56 UTC (rev 5982)
+++ trunk/libnokogiri-ruby/debian/changelog	2010-12-14 04:16:12 UTC (rev 5983)
@@ -1,8 +1,11 @@
-libnokogiri-ruby (1.4.0-4) UNRELEASED; urgency=low
+libnokogiri-ruby (1.4.0-3.1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Non-maintainer upload.
+  * debian/patches
+    - add fix-test_element_description.rb.patch from upstream git to fix
+     FTBFS (Closes: #577355)
 
- -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Thu, 21 Jan 2010 11:06:46 +1300
+ -- Hideki Yamane <henrich at debian.org>  Fri, 23 Jul 2010 01:32:30 +0900
 
 libnokogiri-ruby (1.4.0-3) unstable; urgency=low
 

Added: trunk/libnokogiri-ruby/debian/patches/fix-test_element_description.rb.patch
===================================================================
--- trunk/libnokogiri-ruby/debian/patches/fix-test_element_description.rb.patch	                        (rev 0)
+++ trunk/libnokogiri-ruby/debian/patches/fix-test_element_description.rb.patch	2010-12-14 04:16:12 UTC (rev 5983)
@@ -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

Modified: trunk/libnokogiri-ruby/debian/patches/series
===================================================================
--- trunk/libnokogiri-ruby/debian/patches/series	2010-11-28 21:34:56 UTC (rev 5982)
+++ trunk/libnokogiri-ruby/debian/patches/series	2010-12-14 04:16:12 UTC (rev 5983)
@@ -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