[DRE-commits] [ruby-excon] 02/03: refresh patches

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-excon.

commit 65e84aec7f9f34de386449bfb8d2daedc28f8f18
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Jan 13 23:10:57 2014 +0530

    refresh patches
---
 debian/patches/01_use_ca-certificates.patch        |  2 +-
 ...ubygems_bundler_add_requires_from_gemspec.patch | 33 ++++++----------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/debian/patches/01_use_ca-certificates.patch b/debian/patches/01_use_ca-certificates.patch
index de3685f..1bde3a6 100644
--- a/debian/patches/01_use_ca-certificates.patch
+++ b/debian/patches/01_use_ca-certificates.patch
@@ -5,7 +5,7 @@ Last-Updated: 2013-05-16
 
 --- a/lib/excon/constants.rb
 +++ b/lib/excon/constants.rb
-@@ -2,7 +2,7 @@
+@@ -4,7 +4,7 @@
  
    CR_NL = "\r\n"
  
diff --git a/debian/patches/03_remove_rubygems_bundler_add_requires_from_gemspec.patch b/debian/patches/03_remove_rubygems_bundler_add_requires_from_gemspec.patch
index 38772e2..dff758f 100644
--- a/debian/patches/03_remove_rubygems_bundler_add_requires_from_gemspec.patch
+++ b/debian/patches/03_remove_rubygems_bundler_add_requires_from_gemspec.patch
@@ -1,34 +1,19 @@
-Description: We don't need bundler
- Add dependencies in debian/control.
- Add require lines in test_helper.rb
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Last-Update: 2013-05-20
-
 --- a/tests/test_helper.rb
 +++ b/tests/test_helper.rb
-@@ -1,10 +1,22 @@
+@@ -1,5 +1,14 @@
 -require 'rubygems' if RUBY_VERSION < '1.9'
--require 'bundler'
-+#require 'rubygems' if RUBY_VERSION < '1.9'
-+#require 'bundler'
- 
--Bundler.require(:default, :development)
-+#Bundler.require(:default, :development)
- 
- require 'stringio'
- 
+-require 'bundler/setup'
++# require 'rubygems' if RUBY_VERSION < '1.9'
++# require 'bundler/setup'
++
 +# from gemspec
-+require 'active_support' 
-+require 'delorean'
++require 'active_support'
 +require 'eventmachine'
-+require 'open4'
 +require 'rake'
 +require 'rdoc'
 +require 'shindo'
 +require 'sinatra'
 +
-+require 'excon'
-+
- def basic_tests(url = 'http://127.0.0.1:9292', options = {})
-   [false, true].each do |nonblock|
-     options = options.merge({:ssl_verify_peer => false, :nonblock => nonblock })
+ require 'excon'
+ require 'delorean'
+ require 'open4'

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