[DRE-commits] [SCM] ruby-webmock.git branch, master, updated. upstream/1.11.0-9-g10db919

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 10db919870ce9211584e008cba86f7e7613a4a52
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon May 20 20:04:02 2013 +0530

    remove rrubygems, curb version check

diff --git a/debian/patches/remove-rubygems-curb-version-check.patch b/debian/patches/remove-rubygems-curb-version-check.patch
new file mode 100644
index 0000000..163b92a
--- /dev/null
+++ b/debian/patches/remove-rubygems-curb-version-check.patch
@@ -0,0 +1,21 @@
+--- a/lib/webmock/http_lib_adapters/curb_adapter.rb
++++ b/lib/webmock/http_lib_adapters/curb_adapter.rb
+@@ -5,7 +5,8 @@
+ end
+ 
+ if defined?(Curl)
+-  WebMock::VersionChecker.new('Curb', Gem.loaded_specs['curb'].version.to_s, '0.7.16').check_version!
++#  debian/control has ruby-curb >= 0.7.16 as build dependency
++#  WebMock::VersionChecker.new('Curb', Gem.loaded_specs['curb'].version.to_s, '0.7.16').check_version!
+ 
+   module WebMock
+     module HttpLibAdapters
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,4 +1,5 @@
+-require 'rubygems'
++# all dependencies are covered in debian/control
++# require 'rubygems'
+ require 'httpclient'
+ unless RUBY_PLATFORM =~ /java/
+   require 'curb'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..defa786
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove-rubygems-curb-version-check.patch

-- 
ruby-webmock.git