[DRE-commits] [ruby-faraday] 07/12: d/patches: Refresh remove-bundler

[Sebastien Badia]

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

sbadia-guest pushed a commit to branch master
in repository ruby-faraday.

commit 1e0def82da344f8f363c50df7357b9b2d80e0891
Author: Sebastien Badia <seb at sebian.fr>
Date:   Sat Apr 12 19:08:09 2014 +0200

    d/patches: Refresh remove-bundler
---
 debian/changelog                             |  1 +
 debian/patches/001_remove-bundler.patch      | 21 ++++++++++++++++++
 debian/patches/remove-rubygems-bundler.patch | 33 ----------------------------
 debian/patches/series                        |  2 +-
 4 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10aa5d2..407b8ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ruby-faraday (0.8.7-2) UNRELEASED; urgency=low
 
   [ Sebastien Badia ]
   * Bump Standard Versions to 3.9.5 (no changes)
+  * Refresh remove-bundler patch
 
  -- Praveen Arimbrathodiyil <praveen at debian.org>  Mon, 20 May 2013 04:20:08 +0530
 
diff --git a/debian/patches/001_remove-bundler.patch b/debian/patches/001_remove-bundler.patch
new file mode 100644
index 0000000..e702e42
--- /dev/null
+++ b/debian/patches/001_remove-bundler.patch
@@ -0,0 +1,21 @@
+Description: we don't need rubygems or bundler
+Author: Praveen Arimbrathodiyil <praveen at debian.org>
+Forwarded: not-needed
+Reviewed-By: Sebastien Badia <seb at sebian.fr>
+Last-Update: 2014-04-11
+
+--- ruby-faraday-0.9.0.orig/script/test
++++ ruby-faraday-0.9.0/script/test
+@@ -19,9 +19,9 @@
+ #   $ RBENV_VERSIONS="1.9.3-p194 ree-1.8.7-2012.02" script/test
+ set -e
+ 
+-if [[ "$RUBYOPT" != *"bundler/setup"* ]]; then
+-  export RUBYOPT="-rbundler/setup $RUBYOPT"
+-fi
++#if [[ "$RUBYOPT" != *"bundler/setup"* ]]; then
++#  export RUBYOPT="-rbundler/setup $RUBYOPT"
++#fi
+ 
+ port=3999
+ proxy_port=3998
diff --git a/debian/patches/remove-rubygems-bundler.patch b/debian/patches/remove-rubygems-bundler.patch
deleted file mode 100644
index 2c6fe18..0000000
--- a/debian/patches/remove-rubygems-bundler.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: we don't need rubygems or bundler
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Last-Updated: 2013-05-16
-
---- a/script/test
-+++ b/script/test
-@@ -12,16 +12,16 @@
- #   $ script/test excon typhoeus
- #   $ SSL=yes script/test net_http -- -n /ssl/
- 
--require 'rubygems'
--require 'bundler'
--begin
--  Bundler.setup
--rescue Bundler::GemNotFound
--  $stderr.print "Error: "
--  $stderr.puts $!.message
--  warn "Run `bundle install` to install missing gems."
--  exit 1
--end
-+#require 'rubygems'
-+#require 'bundler'
-+#begin
-+#  Bundler.setup
-+#rescue Bundler::GemNotFound
-+#  $stderr.print "Error: "
-+#  $stderr.puts $!.message
-+#  warn "Run `bundle install` to install missing gems."
-+#  exit 1
-+#end
- 
- $VERBOSE = true
- 
diff --git a/debian/patches/series b/debian/patches/series
index 005fb51..5769a33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-remove-rubygems-bundler.patch
+001_remove-bundler.patch

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