[DRE-commits] [bundler] 04/08: Undo upstream's forced usage of bundled libraries

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository bundler.

commit 5a4e6bb0074eb8c9912becf4cf13c79b7c523eb9
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue May 26 02:02:26 2015 +0200

    Undo upstream's forced usage of bundled libraries
---
 debian/patches/series      |  1 +
 debian/patches/unvendorize | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index e69de29..909ee74 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+unvendorize
diff --git a/debian/patches/unvendorize b/debian/patches/unvendorize
new file mode 100644
index 0000000..ac475a9
--- /dev/null
+++ b/debian/patches/unvendorize
@@ -0,0 +1,32 @@
+Description: replace bundled libraries with system versions
+Forwarded: not-needed
+Origin: vendor
+Author: Christian Hofstaedtler <zeha at debian.org>diff --git a/lib/bundler/vendored_molinillo.rb b/lib/bundler/vendored_molinillo.rb
+index 4081f3f..2d06aac 100644
+--- a/lib/bundler/vendored_molinillo.rb
++++ b/lib/bundler/vendored_molinillo.rb
+@@ -1,2 +1,2 @@
+ module Bundler; end
+-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
++++ b/lib/bundler/vendored_persistent.rb
+@@ -6,6 +6,4 @@ rescue LoadError
+   # some Ruby builds don't have OpenSSL
+ end
+ 
+-vendor = File.expand_path('../vendor', __FILE__)
+-$:.unshift(vendor) unless $:.include?(vendor)
+ 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'

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