[DRE-commits] [SCM] ruby-excon.git branch, master, updated. debian/0.13.4-1-11-gedfd924

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit edfd924738568ae8238eccee5b467fbe8feafcee
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon May 20 01:21:17 2013 +0530

    add pacthes to remove rubygems and bundler

diff --git a/debian/changelog b/debian/changelog
index 4406436..ca20be5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ ruby-excon (0.21.0-1) UNRELEASED; urgency=low
   * Update build dependencies (gem2deb (>= 0.3.0~), rake, ruby-rspec, 
     ruby-chronic, ruby-shindo, ruby-sinatra, ruby-open4, ruby-activesupport,
      ruby-delorean, ruby-eventmachine)
+  * debian/patches/02_remove_gemfile_lock.patch: Remove Gemfile.lock
+  * debian/patches/03_remove_rubygems_bundler_add_requires_from_gemspec.patch:
+    Remove rubygems and bundler, add require lines instead of Bundler.require
 
  -- Praveen Arimbrathodiyil <praveen at debian.org>  Thu, 16 May 2013 20:49:12 +0530
 
diff --git a/debian/patches/02_remove_gemfile_lock.patch b/debian/patches/02_remove_gemfile_lock.patch
new file mode 100644
index 0000000..31dfdc4
--- /dev/null
+++ b/debian/patches/02_remove_gemfile_lock.patch
@@ -0,0 +1,57 @@
+--- a/Gemfile.lock
++++ /dev/null
+@@ -1,54 +0,0 @@
+-PATH
+-  remote: .
+-  specs:
+-    excon (0.21.0)
+-
+-GEM
+-  remote: http://rubygems.org/
+-  specs:
+-    activesupport (3.2.6)
+-      i18n (~> 0.6)
+-      multi_json (~> 1.0)
+-    bouncy-castle-java (1.5.0146.1)
+-    chronic (0.6.7)
+-    delorean (2.0.0)
+-      chronic
+-    eventmachine (1.0.0)
+-    eventmachine (1.0.0-java)
+-    formatador (0.2.3)
+-    i18n (0.6.0)
+-    jruby-openssl (0.7.7)
+-      bouncy-castle-java (>= 1.5.0146.1)
+-    json (1.7.3)
+-    json (1.7.3-java)
+-    multi_json (1.3.6)
+-    open4 (1.3.0)
+-    rack (1.4.1)
+-    rack-protection (1.2.0)
+-      rack
+-    rake (0.9.2.2)
+-    rdoc (3.12)
+-      json (~> 1.4)
+-    shindo (0.3.4)
+-      formatador (>= 0.1.1)
+-    sinatra (1.3.2)
+-      rack (~> 1.3, >= 1.3.6)
+-      rack-protection (~> 1.2)
+-      tilt (~> 1.3, >= 1.3.3)
+-    tilt (1.3.3)
+-
+-PLATFORMS
+-  java
+-  ruby
+-
+-DEPENDENCIES
+-  activesupport
+-  delorean
+-  eventmachine
+-  excon!
+-  jruby-openssl
+-  open4
+-  rake
+-  rdoc
+-  shindo
+-  sinatra
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
new file mode 100644
index 0000000..776f89a
--- /dev/null
+++ b/debian/patches/03_remove_rubygems_bundler_add_requires_from_gemspec.patch
@@ -0,0 +1,28 @@
+--- a/tests/test_helper.rb
++++ b/tests/test_helper.rb
+@@ -1,10 +1,22 @@
+-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'
+ 
++# from gemspec
++require 'active_support' 
++require 'delorean'
++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 })
diff --git a/debian/patches/series b/debian/patches/series
index eeb0d4a..6bd4c53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 01_use_ca-certificates.patch
+02_remove_gemfile_lock.patch 
+03_remove_rubygems_bundler_add_requires_from_gemspec.patch

-- 
ruby-excon.git