[DRE-commits] [ruby-webmock] 03/08: refresh patches

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-webmock.

commit f11088f1efd0e34049a96f060993f73a8c76eb65
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jan 22 12:02:11 2016 -0200

    refresh patches
---
 debian/changelog                                       |  3 +++
 debian/patches/remove-patron.patch                     |  6 +++---
 .../patches/remove-rubygems-curb-version-check.patch   | 18 ------------------
 debian/patches/series                                  |  1 -
 .../patches/skip-gem-building-whitespace-tests.patch   |  6 +++---
 5 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67ab670..c566a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ ruby-webmock (1.22.6-1) UNRELEASED; urgency=medium
 
   * Team upload
   * New upsteam release
+  * Refresh patches
+  * Drop remove-rubygems-curb-version-check.patch, not needed
+    anymore
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 22 Jan 2016 11:45:36 -0200
 
diff --git a/debian/patches/remove-patron.patch b/debian/patches/remove-patron.patch
index 3cd2029..2f4b3dc 100644
--- a/debian/patches/remove-patron.patch
+++ b/debian/patches/remove-patron.patch
@@ -5,9 +5,9 @@ Last-Updated: 2014-07-08
 
 --- a/lib/webmock.rb
 +++ b/lib/webmock.rb
-@@ -41,7 +41,7 @@
+@@ -44,7 +44,7 @@ require 'webmock/http_lib_adapters/http_
  require 'webmock/http_lib_adapters/net_http'
- require 'webmock/http_lib_adapters/http_gem_adapter'
+ require 'webmock/http_lib_adapters/http_rb_adapter'
  require 'webmock/http_lib_adapters/httpclient_adapter'
 -require 'webmock/http_lib_adapters/patron_adapter'
 +#require 'webmock/http_lib_adapters/patron_adapter'
@@ -16,7 +16,7 @@ Last-Updated: 2014-07-08
  require 'webmock/http_lib_adapters/typhoeus_hydra_adapter'
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -2,7 +2,6 @@
+@@ -2,7 +2,6 @@ require 'rubygems'
  require 'httpclient'
  unless RUBY_PLATFORM =~ /java/
    require 'curb'
diff --git a/debian/patches/remove-rubygems-curb-version-check.patch b/debian/patches/remove-rubygems-curb-version-check.patch
deleted file mode 100644
index 3108ddb..0000000
--- a/debian/patches/remove-rubygems-curb-version-check.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: don't use rubygems for curb version check
- we'll specify required curb version in build dep
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Forwarded: no
-Last-Update: 2013-05-26
-
---- 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', Curl::CURB_VERSION, '0.7.16').check_version!
-+#  debian/control has ruby-curb >= 0.7.16 as build dependency
-+#  WebMock::VersionChecker.new('Curb', Curl::CURB_VERSION, '0.7.16').check_version!
- 
-   module WebMock
-     module HttpLibAdapters
diff --git a/debian/patches/series b/debian/patches/series
index 9e1cd45..5084960 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-remove-rubygems-curb-version-check.patch
 skip-gem-building-whitespace-tests.patch
 #deactivate_tests_with_network.patch
 #skip-excon-incompatible-test.patch
diff --git a/debian/patches/skip-gem-building-whitespace-tests.patch b/debian/patches/skip-gem-building-whitespace-tests.patch
index 71dc1f4..0d4dac4 100644
--- a/debian/patches/skip-gem-building-whitespace-tests.patch
+++ b/debian/patches/skip-gem-building-whitespace-tests.patch
@@ -5,7 +5,7 @@ Last-Update: 2013-05-26
 
 --- a/spec/quality_spec.rb
 +++ b/spec/quality_spec.rb
-@@ -61,9 +61,10 @@
+@@ -61,9 +61,10 @@ describe "The library itself" do
    end
  
    it "has no malformed whitespace" do
@@ -17,11 +17,11 @@ Last-Update: 2013-05-26
          next if filename =~ /\.gitmodules|fixtures/
          error_messages << check_for_tab_characters(filename)
          error_messages << check_for_extra_spaces(filename)
-@@ -73,6 +74,7 @@
+@@ -73,6 +74,7 @@ describe "The library itself" do
    end
  
    it "can still be built" do
 +		pending 'git ls-files to build gemspec won\'t work outside git repo'
      Dir.chdir(File.expand_path('../../', __FILE__)) do
        `gem build webmock.gemspec`
-       $?.should == 0
+       expect($?).to eq(0)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-webmock.git