[DRE-commits] [bundler] 02/07: Refresh patches

Mon Jul 3 20:19:30 UTC 2017

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

lucas pushed a commit to branch master
in repository bundler.

commit b4b000fdfc81f42c5e2bffc47dfc53e7b8da252b
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Sun Jul 2 09:31:36 2017 +0200

    Refresh patches
---
 debian/patches/0004-Fix-typo-in-manpages.patch   | 26 ----------------------
 debian/patches/do-not-add-system-path-to-RUBYLIB |  8 +++----
 debian/patches/no-git-in-gemspec                 |  4 ++--
 debian/patches/series                            |  1 -
 debian/patches/unvendorize                       | 28 ++++++++++--------------
 5 files changed, 18 insertions(+), 49 deletions(-)

diff --git a/debian/patches/0004-Fix-typo-in-manpages.patch b/debian/patches/0004-Fix-typo-in-manpages.patch
index 885c054..8b67ba3 100644
--- a/debian/patches/0004-Fix-typo-in-manpages.patch
+++ b/debian/patches/0004-Fix-typo-in-manpages.patch
@@ -7,29 +7,3 @@ Subject: Fix typo in manpages
  man/bundle-install.ronn | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn
-index 3ea6d10..57598cb 100644
---- a/man/bundle-config.ronn
-+++ b/man/bundle-config.ronn
-@@ -65,7 +65,7 @@ The options that can be configured are:
-   The location to install the specified gems to. This defaults to Rubygems'
-   setting. Bundler shares this location with Rubygems, `gem install ...` will
-   have gem installed there, too. Therefore, gems installed without a
--  `--path ...` setting will show up by calling `gem list`. Accodingly, gems
-+  `--path ...` setting will show up by calling `gem list`. Accordingly, gems
-   installed to other locations will not get listed.
- 
- * `without`:
-diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn
-index 92d1d8d..3a03090 100644
---- a/man/bundle-install.ronn
-+++ b/man/bundle-install.ronn
-@@ -110,7 +110,7 @@ time `bundle install` is run, use `bundle config` (see bundle-config(1)).
-   The location to install the specified gems to. This defaults to Rubygems'
-   setting. Bundler shares this location with Rubygems, `gem install ...` will
-   have gem installed there, too. Therefore, gems installed without a
--  `--path ...` setting will show up by calling `gem list`. Accodingly, gems
-+  `--path ...` setting will show up by calling `gem list`. Accordingly, gems
-   installed to other locations will not get listed.
- 
- * `--quiet`:
diff --git a/debian/patches/do-not-add-system-path-to-RUBYLIB b/debian/patches/do-not-add-system-path-to-RUBYLIB
index 171bcc1..77c2f0c 100644
--- a/debian/patches/do-not-add-system-path-to-RUBYLIB
+++ b/debian/patches/do-not-add-system-path-to-RUBYLIB
@@ -16,7 +16,7 @@ Origin: vendor
 
 --- a/lib/bundler.rb
 +++ b/lib/bundler.rb
-@@ -232,12 +232,6 @@
+@@ -270,12 +270,6 @@ EOF
          env["RUBYOPT"] = env["RUBYOPT"].sub "-rbundler/setup", ""
        end
  
@@ -31,13 +31,13 @@ Origin: vendor
  
 --- a/lib/bundler/shared_helpers.rb
 +++ b/lib/bundler/shared_helpers.rb
-@@ -201,9 +201,6 @@
+@@ -235,9 +235,6 @@ module Bundler
      end
  
      def set_rubylib
 -      rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
--      rubylib.unshift File.expand_path("../..", __FILE__)
+-      rubylib.unshift bundler_ruby_lib
 -      ENV["RUBYLIB"] = rubylib.uniq.join(File::PATH_SEPARATOR)
      end
  
-     def clean_load_path
+     def bundler_ruby_lib
diff --git a/debian/patches/no-git-in-gemspec b/debian/patches/no-git-in-gemspec
index 3ef44b7..ce604e9 100644
--- a/debian/patches/no-git-in-gemspec
+++ b/debian/patches/no-git-in-gemspec
@@ -14,14 +14,14 @@ Origin: vendor
 
 --- a/bundler.gemspec
 +++ b/bundler.gemspec
-@@ -24,10 +24,7 @@
+@@ -37,10 +37,7 @@ Gem::Specification.new do |s|
    s.add_development_dependency "ronn",       "~> 0.7.3"
    s.add_development_dependency "rspec",      "~> 3.5"
  
 -  s.files = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^(test|spec|features)/}) }
 -  # we don't check in man pages, but we need to ship them because
 -  # we use them to generate the long-form help for each command.
--  s.files += Dir.glob("lib/bundler/man/**/*")
+-  s.files += Dir.glob("man/**/*")
 +  s.files = Dir.glob("lib/**") + Dir.glob("exe/*") + Dir.glob("*.md") + Dir.glob("man/*")
  
    s.bindir        = "exe"
diff --git a/debian/patches/series b/debian/patches/series
index 5782fbb..9f17f27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 no-git-in-gemspec
 unvendorize
 do-not-add-system-path-to-RUBYLIB
-0004-Fix-typo-in-manpages.patch
diff --git a/debian/patches/unvendorize b/debian/patches/unvendorize
index e0bde61..5da01d4 100644
--- a/debian/patches/unvendorize
+++ b/debian/patches/unvendorize
@@ -10,8 +10,6 @@ Origin: vendor
  lib/bundler/vendored_thor.rb       | 4 ++--
  3 files changed, 3 insertions(+), 5 deletions(-)
 
-diff --git a/lib/bundler/vendored_molinillo.rb b/lib/bundler/vendored_molinillo.rb
-index 7b23126..9b04189 100644
 --- a/lib/bundler/vendored_molinillo.rb
 +++ b/lib/bundler/vendored_molinillo.rb
 @@ -1,3 +1,3 @@
@@ -19,25 +17,23 @@ index 7b23126..9b04189 100644
  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 d5ae513..0611fbe 100644
 --- a/lib/bundler/vendored_persistent.rb
 +++ b/lib/bundler/vendored_persistent.rb
-@@ -7,6 +7,4 @@ rescue LoadError
-   # some Ruby builds don't have OpenSSL
+@@ -14,4 +14,4 @@ module Bundler
+     end
+   end
  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 0d0b45b..03cedb1 100644
+-require "bundler/vendor/net-http-persistent/lib/net/http/persistent"
++require "net/http/persistent"
 --- a/lib/bundler/vendored_thor.rb
 +++ b/lib/bundler/vendored_thor.rb
-@@ -1,4 +1,4 @@
+@@ -1,7 +1,7 @@
  # frozen_string_literal: true
- module Bundler; end
+ module Bundler
+   def self.require_thor_actions
+-    Kernel.send(:require, "bundler/vendor/thor/lib/thor/actions")
++    Kernel.send(:require, "thor/actions")
+   end
+ 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

