[DRE-commits] [bundler] 01/03: Apply patch from upstream to work with molinillo 0.5.0

zeha at debian.org zeha at debian.org
Tue Jul 5 11:37:50 UTC 2016


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

zeha pushed a commit to branch master
in repository bundler.

commit 38d7c7423111a3346e8193bd7793835a86ed99cd
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Jul 5 10:23:09 2016 +0200

    Apply patch from upstream to work with molinillo 0.5.0
---
 .../0002-Mark-molinillo-methods-as-public.patch    | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/0002-Mark-molinillo-methods-as-public.patch b/debian/patches/0002-Mark-molinillo-methods-as-public.patch
new file mode 100644
index 0000000..cf852cf
--- /dev/null
+++ b/debian/patches/0002-Mark-molinillo-methods-as-public.patch
@@ -0,0 +1,30 @@
+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 3d60b19..640eba4 100644
+--- a/lib/bundler/resolver.rb
++++ b/lib/bundler/resolver.rb
+@@ -239,8 +239,6 @@ module Bundler
+       Bundler.ui.info ".", false
+     end
+ 
+-  private
+-
+     include Molinillo::SpecificationProvider
+ 
+     def dependencies_for(specification)
+@@ -307,6 +305,8 @@ module Bundler
+       end
+     end
+ 
++  private
++
+     def amount_constrained(dependency)
+       @amount_constrained ||= {}
+       @amount_constrained[dependency.name] ||= begin
diff --git a/debian/patches/series b/debian/patches/series
index f30ce7b..a10e431 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 no-git-in-gemspec
 unvendorize
+0002-Mark-molinillo-methods-as-public.patch

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



More information about the Pkg-ruby-extras-commits mailing list