[DRE-commits] [SCM] ruby-roxml.git branch, master, updated. upstream/3.3.1-19-g5d802ed

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 5d802ed226a4f17231c2d3e5bfd18bf12c2e373a
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sun Jun 23 22:33:26 2013 +0200

    deactivate failing activesupport version test. Closes #713137

diff --git a/debian/changelog b/debian/changelog
index 8d40e41..7c62fbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-roxml (3.3.1-2) unstable; urgency=low
+
+  * Set urgency to medium as an RC bug is fixed.
+  * Add deactivate_activesupport_gem_version_test.patch, disabling a failing
+    version check based on rubygems for activesupport, which prevented
+    extension to be loaded, and thus caused FTBFS. (Closes: #713137)
+    
+ -- Cédric Boutillier <boutil at debian.org>  Sun, 23 Jun 2013 22:26:31 +0200
+
 ruby-roxml (3.3.1-1) unstable; urgency=low
 
   * Initial release (Closes: #657952)
diff --git a/debian/patches/deactivate_activesupport_gem_version_test.patch b/debian/patches/deactivate_activesupport_gem_version_test.patch
new file mode 100644
index 0000000..c31150c
--- /dev/null
+++ b/debian/patches/deactivate_activesupport_gem_version_test.patch
@@ -0,0 +1,29 @@
+Description: deactivate Gem test version for active_support
+ Debian Jessie has already ruby-activesupport version >= 3.
+ Since it is not loaded via rubygems, ruby-activesupport are not available, the
+ test fails, and core extensions are not loaded, which causes errors when the
+ library is loaded.
+Author: Cédric Boutillier <boutil at debian.org>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713137
+Last-Update: 2013-06-23
+
+--- a/lib/roxml.rb
++++ b/lib/roxml.rb
+@@ -1,14 +1,14 @@
+ require 'uri'
+ 
+ require 'active_support'
+-if Gem.loaded_specs['activesupport'] && Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3')
++#if Gem.loaded_specs['activesupport'] && Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3')
+   require 'active_support/inflector'
+   require 'active_support/core_ext/object/duplicable'
+   require 'active_support/core_ext/module/delegation'
+   require 'active_support/core_ext/array/extract_options'
+   require 'active_support/core_ext/hash'
+   require 'active_support/core_ext/string/starts_ends_with'
+-end
++#end
+ 
+ require 'roxml/definition'
+ require 'roxml/xml'
diff --git a/debian/patches/series b/debian/patches/series
index f1b567b..52a2fb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+deactivate_activesupport_gem_version_test.patch
 require-system-roxml.patch
 require-rspec.patch
 use_moved_VERSION.patch

-- 
ruby-roxml.git