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

[Ryan Niebur]

Author: ryan52-guest
Date: 2009-09-16 04:37:58 +0000 (Wed, 16 Sep 2009)
New Revision: 4146

Added:
   trunk/libnokogiri-ruby/debian/patches/
   trunk/libnokogiri-ruby/debian/patches/get-rid-of-annoying-warning.patch
   trunk/libnokogiri-ruby/debian/patches/series
Modified:
   trunk/libnokogiri-ruby/debian/changelog
   trunk/libnokogiri-ruby/debian/rules
Log:
get rid of the annoying libxml warning messages (Closes: 546843)

Modified: trunk/libnokogiri-ruby/debian/changelog
===================================================================
--- trunk/libnokogiri-ruby/debian/changelog	2009-09-15 16:02:37 UTC (rev 4145)
+++ trunk/libnokogiri-ruby/debian/changelog	2009-09-16 04:37:58 UTC (rev 4146)
@@ -1,3 +1,10 @@
+libnokogiri-ruby (1.3.3-2) UNRELEASED; urgency=low
+
+  * add quilt patching
+  * get rid of the annoying libxml warning messages (Closes: 546843)
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Tue, 15 Sep 2009 21:37:44 -0700
+
 libnokogiri-ruby (1.3.3-1) unstable; urgency=low
 
   * New upstream release

Added: trunk/libnokogiri-ruby/debian/patches/get-rid-of-annoying-warning.patch
===================================================================
--- trunk/libnokogiri-ruby/debian/patches/get-rid-of-annoying-warning.patch	                        (rev 0)
+++ trunk/libnokogiri-ruby/debian/patches/get-rid-of-annoying-warning.patch	2009-09-16 04:37:58 UTC (rev 4146)
@@ -0,0 +1,23 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=546843
+
+Index: b/lib/nokogiri/version.rb
+===================================================================
+--- a/lib/nokogiri/version.rb
++++ b/lib/nokogiri/version.rb
+@@ -12,11 +12,11 @@
+     VERSION_INFO['libxml']['compiled']  = LIBXML_VERSION
+     VERSION_INFO['libxml']['loaded']    = LIBXML_PARSER_VERSION.scan(/^(.*)(..)(..)$/).first.collect{|j|j.to_i}.join(".")
+ 
+-    if VERSION_INFO['libxml']['compiled'] != VERSION_INFO['libxml']['loaded']
+-      warning = "Nokogiri was built against LibXML version #{VERSION_INFO['libxml']['compiled']}, but has dynamically loaded #{VERSION_INFO['libxml']['loaded']}"
+-      VERSION_INFO['warnings'] << warning
+-      warn "WARNING: #{warning}"
+-    end
++#    if VERSION_INFO['libxml']['compiled'] != VERSION_INFO['libxml']['loaded']
++#      warning = "Nokogiri was built against LibXML version #{VERSION_INFO['libxml']['compiled']}, but has dynamically loaded #{VERSION_INFO['libxml']['loaded']}"
++#      VERSION_INFO['warnings'] << warning
++#      warn "WARNING: #{warning}"
++#    end
+   end
+ 
+   def self.uses_libxml? # :nodoc:

Added: trunk/libnokogiri-ruby/debian/patches/series
===================================================================
--- trunk/libnokogiri-ruby/debian/patches/series	                        (rev 0)
+++ trunk/libnokogiri-ruby/debian/patches/series	2009-09-16 04:37:58 UTC (rev 4146)
@@ -0,0 +1 @@
+get-rid-of-annoying-warning.patch

Modified: trunk/libnokogiri-ruby/debian/rules
===================================================================
--- trunk/libnokogiri-ruby/debian/rules	2009-09-15 16:02:37 UTC (rev 4145)
+++ trunk/libnokogiri-ruby/debian/rules	2009-09-16 04:37:58 UTC (rev 4146)
@@ -3,6 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
 include /usr/share/ruby-pkg-tools/1/class/ruby-extconf-rb.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_RUBY_SETUP_CMD = ext/nokogiri/extconf.rb
 DEB_INSTALL_CHANGELOGS_ALL = CHANGELOG.rdoc