[DRE-commits] [bundler] 05/08: Refresh patch

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository bundler.

commit e155d403e9eaba44370d02c70238af6063ea2818
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Feb 15 15:39:51 2016 -0200

    Refresh patch
---
 debian/changelog           |  1 +
 debian/patches/unvendorize | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc8fa72..65e144e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 bundler (1.11.2-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Refresh patch
   * Move build-essential, less, ruby-dev and sudo from Recommends: to
     Suggests:. This way users installing Rails applications won't get
     a full toolchain installed as well.
diff --git a/debian/patches/unvendorize b/debian/patches/unvendorize
index ac475a9..03c3a46 100644
--- a/debian/patches/unvendorize
+++ b/debian/patches/unvendorize
@@ -7,8 +7,8 @@ index 4081f3f..2d06aac 100644
 +++ b/lib/bundler/vendored_molinillo.rb
 @@ -1,2 +1,2 @@
  module Bundler; end
--require 'bundler/vendor/molinillo/lib/molinillo'
-+require 'molinillo'
+-require "bundler/vendor/molinillo/lib/molinillo"
++require "molinillo"
 diff --git a/lib/bundler/vendored_persistent.rb b/lib/bundler/vendored_persistent.rb
 index 8ed4ce8..66bc0cf 100644
 --- a/lib/bundler/vendored_persistent.rb
@@ -17,16 +17,16 @@ index 8ed4ce8..66bc0cf 100644
    # some Ruby builds don't have OpenSSL
  end
  
--vendor = File.expand_path('../vendor', __FILE__)
+-vendor = File.expand_path("../vendor", __FILE__)
 -$:.unshift(vendor) unless $:.include?(vendor)
- require 'net/http/persistent'
+ require "net/http/persistent"
 diff --git a/lib/bundler/vendored_thor.rb b/lib/bundler/vendored_thor.rb
 index 1931b5f..0703126 100644
 --- a/lib/bundler/vendored_thor.rb
 +++ b/lib/bundler/vendored_thor.rb
 @@ -1,3 +1,3 @@
  module Bundler; end
--require 'bundler/vendor/thor/lib/thor'
--require 'bundler/vendor/thor/lib/thor/actions'
-+require 'thor'
-+require 'thor/actions'
+-require "bundler/vendor/thor/lib/thor"
+-require "bundler/vendor/thor/lib/thor/actions"
++require "thor"
++require "thor/actions"

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