[DRE-commits] [bundler] 02/03: Refresh patch (for gbp pq)

[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 9cf6d7a6cd07940be8e1c7a191aeb8d9c736e654
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Jul 5 10:22:42 2016 +0200

    Refresh patch (for gbp pq)
    
    Git-Dch: ignore
---
 .../0002-Mark-molinillo-methods-as-public.patch    |  6 +++---
 debian/patches/no-git-in-gemspec                   | 22 ++++++++++++-------
 debian/patches/unvendorize                         | 25 +++++++++++++++-------
 3 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/debian/patches/0002-Mark-molinillo-methods-as-public.patch b/debian/patches/0002-Mark-molinillo-methods-as-public.patch
index cf852cf..0e12688 100644
--- a/debian/patches/0002-Mark-molinillo-methods-as-public.patch
+++ b/debian/patches/0002-Mark-molinillo-methods-as-public.patch
@@ -7,10 +7,10 @@ Subject: Mark molinillo methods as public
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
-index 3d60b19..640eba4 100644
+index 48f0d46..980d9a0 100644
 --- a/lib/bundler/resolver.rb
 +++ b/lib/bundler/resolver.rb
-@@ -239,8 +239,6 @@ module Bundler
+@@ -240,8 +240,6 @@ module Bundler
        Bundler.ui.info ".", false
      end
  
@@ -19,7 +19,7 @@ index 3d60b19..640eba4 100644
      include Molinillo::SpecificationProvider
  
      def dependencies_for(specification)
-@@ -307,6 +305,8 @@ module Bundler
+@@ -308,6 +306,8 @@ module Bundler
        end
      end
  
diff --git a/debian/patches/no-git-in-gemspec b/debian/patches/no-git-in-gemspec
index 5d7720c..7db6834 100644
--- a/debian/patches/no-git-in-gemspec
+++ b/debian/patches/no-git-in-gemspec
@@ -1,16 +1,22 @@
-Description: replace call to git ls-files with Dir.glob
-Forwarded: not-needed
-Origin: vendor
-Author: Christian Hofstaedtler <zeha at debian.org>
+From: Christian Hofstaedtler <zeha at debian.org>
+Date: Tue, 5 Jul 2016 11:17:16 +0200
+Subject: replace call to git ls-files with Dir.glob
 
 It appears gem2deb munges the gemspec file with a static Encoding of US-ASCII,
 but our gemspec is encoded in UTF-8; this causes gem2deb to fail. Avoid the
 gem2deb munging by not calling git from the gemspec.
 
-Index: bundler/bundler.gemspec
-===================================================================
---- bundler.orig/bundler.gemspec
-+++ bundler/bundler.gemspec
+Forwarded: not-needed
+Origin: vendor
+---
+ bundler.gemspec                                            | 5 +----
+ debian/patches/0002-Mark-molinillo-methods-as-public.patch | 6 +++---
+ 2 files changed, 4 insertions(+), 7 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|
    s.add_development_dependency "ronn",       "~> 0.7.3"
    s.add_development_dependency "rspec",      "~> 3.0"
diff --git a/debian/patches/unvendorize b/debian/patches/unvendorize
index 1d7f60d..495dd14 100644
--- a/debian/patches/unvendorize
+++ b/debian/patches/unvendorize
@@ -1,21 +1,29 @@
-Description: replace bundled libraries with system versions
+From: Christian Hofstaedtler <zeha at debian.org>
+Date: Tue, 5 Jul 2016 10:22:08 +0200
+Subject: replace bundled libraries with system versions
+
 Forwarded: not-needed
 Origin: vendor
-Author: Christian Hofstaedtler <zeha at debian.org>
+---
+ lib/bundler/vendored_molinillo.rb  | 2 +-
+ lib/bundler/vendored_persistent.rb | 2 --
+ 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 4081f3f..2d06aac 100644
+index 7b23126..9b04189 100644
 --- a/lib/bundler/vendored_molinillo.rb
 +++ b/lib/bundler/vendored_molinillo.rb
-@@ -1,2 +1,2 @@
+@@ -1,3 +1,3 @@
+ # frozen_string_literal: true
  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
+index d5ae513..0611fbe 100644
 --- a/lib/bundler/vendored_persistent.rb
 +++ b/lib/bundler/vendored_persistent.rb
-@@ -6,6 +6,4 @@ rescue LoadError
+@@ -7,6 +7,4 @@ rescue LoadError
    # some Ruby builds don't have OpenSSL
  end
  
@@ -23,10 +31,11 @@ index 8ed4ce8..66bc0cf 100644
 -$:.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
+index 0d0b45b..03cedb1 100644
 --- a/lib/bundler/vendored_thor.rb
 +++ b/lib/bundler/vendored_thor.rb
-@@ -1,3 +1,3 @@
+@@ -1,4 +1,4 @@
+ # frozen_string_literal: true
  module Bundler; end
 -require "bundler/vendor/thor/lib/thor"
 -require "bundler/vendor/thor/lib/thor/actions"

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