[DRE-commits] [bundler] 03/03: refresh patches

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository bundler.

commit d46c4cb22a895af52fc3fd513245cc2bd1f66e1f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Sep 18 18:23:46 2016 +0530

    refresh patches
---
 .../0002-Mark-molinillo-methods-as-public.patch    | 30 ----------------------
 debian/patches/do-not-add-system-path-to-RUBYLIB   |  8 ++----
 debian/patches/no-git-in-gemspec                   |  6 ++---
 debian/patches/series                              |  1 -
 4 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/debian/patches/0002-Mark-molinillo-methods-as-public.patch b/debian/patches/0002-Mark-molinillo-methods-as-public.patch
deleted file mode 100644
index 0e12688..0000000
--- a/debian/patches/0002-Mark-molinillo-methods-as-public.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Samuel Giddins <segiddins at segiddins.me>
-Date: Sun, 19 Jun 2016 00:25:12 -0400
-Subject: Mark molinillo methods as public
-
----
- lib/bundler/resolver.rb | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
-index 48f0d46..980d9a0 100644
---- a/lib/bundler/resolver.rb
-+++ b/lib/bundler/resolver.rb
-@@ -240,8 +240,6 @@ module Bundler
-       Bundler.ui.info ".", false
-     end
- 
--  private
--
-     include Molinillo::SpecificationProvider
- 
-     def dependencies_for(specification)
-@@ -308,6 +306,8 @@ module Bundler
-       end
-     end
- 
-+  private
-+
-     def amount_constrained(dependency)
-       @amount_constrained ||= {}
-       @amount_constrained[dependency.name] ||= begin
diff --git a/debian/patches/do-not-add-system-path-to-RUBYLIB b/debian/patches/do-not-add-system-path-to-RUBYLIB
index 6d71f0e..171bcc1 100644
--- a/debian/patches/do-not-add-system-path-to-RUBYLIB
+++ b/debian/patches/do-not-add-system-path-to-RUBYLIB
@@ -14,11 +14,9 @@ Origin: vendor
  lib/bundler/shared_helpers.rb | 3 ---
  2 files changed, 9 deletions(-)
 
-diff --git a/lib/bundler.rb b/lib/bundler.rb
-index dcb151b..138f38a 100644
 --- a/lib/bundler.rb
 +++ b/lib/bundler.rb
-@@ -220,12 +220,6 @@ module Bundler
+@@ -232,12 +232,6 @@
          env["RUBYOPT"] = env["RUBYOPT"].sub "-rbundler/setup", ""
        end
  
@@ -31,11 +29,9 @@ index dcb151b..138f38a 100644
        env
      end
  
-diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb
-index c79c88c..6b77105 100644
 --- a/lib/bundler/shared_helpers.rb
 +++ b/lib/bundler/shared_helpers.rb
-@@ -183,9 +183,6 @@ module Bundler
+@@ -201,9 +201,6 @@
      end
  
      def set_rubylib
diff --git a/debian/patches/no-git-in-gemspec b/debian/patches/no-git-in-gemspec
index f993795..3ef44b7 100644
--- a/debian/patches/no-git-in-gemspec
+++ b/debian/patches/no-git-in-gemspec
@@ -12,13 +12,11 @@ Origin: vendor
  bundler.gemspec | 5 +----
  1 file changed, 1 insertion(+), 4 deletions(-)
 
-diff --git a/bundler.gemspec b/bundler.gemspec
-index 0df6740..a467a7a 100644
 --- a/bundler.gemspec
 +++ b/bundler.gemspec
-@@ -24,10 +24,7 @@ Gem::Specification.new do |s|
+@@ -24,10 +24,7 @@
    s.add_development_dependency "ronn",       "~> 0.7.3"
-   s.add_development_dependency "rspec",      "~> 3.0"
+   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
diff --git a/debian/patches/series b/debian/patches/series
index 7dac214..9f17f27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 no-git-in-gemspec
 unvendorize
-0002-Mark-molinillo-methods-as-public.patch
 do-not-add-system-path-to-RUBYLIB

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