[DRE-commits] [ruby-em-http-request] 06/07: d/patches: Refresh patchs (new upstream version)

[Sebastien Badia]

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

sbadia pushed a commit to branch master
in repository ruby-em-http-request.

commit 4699b7f061c0e5a2f7014d7f1f0aa8b95f34db84
Author: Sebastien Badia <seb at sebian.fr>
Date:   Mon Dec 19 21:46:26 2016 +0100

    d/patches: Refresh patchs (new upstream version)
---
 debian/patches/change_mongrel_to_webrick.patch | 12 ++++++------
 debian/patches/disable-rubygems.patch          |  3 ++-
 debian/patches/require_connection_test.patch   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/patches/change_mongrel_to_webrick.patch b/debian/patches/change_mongrel_to_webrick.patch
index 77e245d..60c72b7 100644
--- a/debian/patches/change_mongrel_to_webrick.patch
+++ b/debian/patches/change_mongrel_to_webrick.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
  
  require 'rack'
  
-@@ -53,7 +56,7 @@
+@@ -53,7 +56,7 @@ module Stallion
  
    def self.run(options = {})
      options = {:Host => "127.0.0.1", :Port => 8090}.merge(options)
@@ -27,7 +27,7 @@ Forwarded: not-needed
    def self.call(env)
 --- a/spec/redirect_spec.rb
 +++ b/spec/redirect_spec.rb
-@@ -345,7 +345,7 @@
+@@ -345,7 +345,7 @@ describe EventMachine::HttpRequest do
        conn = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/http_with_port')
        http = conn.get :redirects => 1
        http.errback {
@@ -36,7 +36,7 @@ Forwarded: not-needed
          EM.stop
        }
      }
-@@ -356,7 +356,7 @@
+@@ -356,7 +356,7 @@ describe EventMachine::HttpRequest do
        conn = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/https_with_port')
        http = conn.get :redirects => 1
        http.errback {
@@ -47,7 +47,7 @@ Forwarded: not-needed
      }
 --- a/spec/client_spec.rb
 +++ b/spec/client_spec.rb
-@@ -236,7 +236,7 @@
+@@ -236,7 +236,7 @@ describe EventMachine::HttpRequest do
        http.callback {
          http.response_header.status.should == 200
  
@@ -56,7 +56,7 @@ Forwarded: not-needed
          EventMachine.stop
        }
      }
-@@ -777,23 +777,6 @@
+@@ -807,23 +807,6 @@ describe EventMachine::HttpRequest do
          end
        end
      }
@@ -82,7 +82,7 @@ Forwarded: not-needed
    it 'should handle malformed Content-Type header repetitions' do
 --- a/spec/dns_spec.rb
 +++ b/spec/dns_spec.rb
-@@ -7,19 +7,7 @@
+@@ -7,19 +7,7 @@ describe EventMachine::HttpRequest do
        http = EventMachine::HttpRequest.new('http://127.0.0.1:8090/redirect/badhost', :connect_timeout => 0.1).get :redirects => 1
        http.callback { failed(http) }
        http.errback {
diff --git a/debian/patches/disable-rubygems.patch b/debian/patches/disable-rubygems.patch
index 499212e..ba6edcf 100644
--- a/debian/patches/disable-rubygems.patch
+++ b/debian/patches/disable-rubygems.patch
@@ -4,7 +4,8 @@ Forwarded: not-needed
 
 --- a/spec/helper.rb
 +++ b/spec/helper.rb
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,7 @@
+ require 'spec_helper'
 -require 'rubygems'
 -require 'bundler/setup'
 +# We don't need rubygems, dependencies are handled by apt
diff --git a/debian/patches/require_connection_test.patch b/debian/patches/require_connection_test.patch
index 0aab93c..9922e33 100644
--- a/debian/patches/require_connection_test.patch
+++ b/debian/patches/require_connection_test.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/spec/helper.rb
 +++ b/spec/helper.rb
-@@ -15,7 +15,7 @@ def failed(http = nil)
+@@ -16,7 +16,7 @@ def failed(http = nil)
  end
  
  def requires_connection(&blk)

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