[DRE-commits] [cucumber] 05/11: Refresh patches.

[Stefano Rivera]

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

stefanor pushed a commit to branch master
in repository cucumber.

commit 50eabf195e47a724105fb8dd2f78c17893f4ae76
Author: Stefano Rivera <stefanor at debian.org>
Date:   Thu Jul 21 15:04:37 2016 -0700

    Refresh patches.
---
 debian/changelog                                   |  1 +
 .../0002-Remove-require-rubygems-statements.patch  | 36 ++++++++--------------
 .../patches/0004-Update_default_binary_path.patch  | 10 +++---
 debian/patches/0005-clean_bin_cucumber.patch       |  8 ++---
 4 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 704a6dd..9acc931 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ cucumber (2.4.0-1) UNRELEASED; urgency=medium
 
   [ Stefano Rivera ]
   * New upstream release.
+  * Refresh patches.
   * New dependency: ruby-cucumber-wire.
   * Bump ruby-gherkin dependency to >= 4.
 
diff --git a/debian/patches/0002-Remove-require-rubygems-statements.patch b/debian/patches/0002-Remove-require-rubygems-statements.patch
index d03f2f3..b63c50b 100644
--- a/debian/patches/0002-Remove-require-rubygems-statements.patch
+++ b/debian/patches/0002-Remove-require-rubygems-statements.patch
@@ -1,24 +1,14 @@
-From 6c6f75c47744c706678e61d7bc90ffe0f345b083 Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro at softwarelivre.org>
-Date: Fri, 12 Aug 2011 00:41:01 -0700
-Subject: [PATCH 2/2] Remove `require 'rubygems'` statements
+Description: Remove require 'rubygems' statements
+Author: Stefano Rivera <stefanor at debian.org>
+Forwarded: not-needed
 
----
- lib/cucumber/cli/main.rb            |    7 +------
- lib/cucumber/formatter/ansicolor.rb |    7 +------
- lib/cucumber/formatter/pdf.rb       |    3 +--
- 3 files changed, 3 insertions(+), 14 deletions(-)
-
---- a/lib/cucumber/cli/main.rb
-+++ b/lib/cucumber/cli/main.rb
-@@ -1,9 +1,4 @@
--begin
--  require 'gherkin'
--rescue LoadError
--  require 'rubygems'
--  require 'gherkin'
--end
-+require 'gherkin'
- require 'optparse'
- require 'cucumber'
- require 'logger'
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,7 +1,4 @@
+ # encoding: utf-8
+-require 'rubygems'
+-require 'bundler'
+-Bundler::GemHelper.install_tasks
+ 
+ $:.unshift(File.dirname(__FILE__) + '/lib')
+ Dir['gem_tasks/**/*.rake'].each { |rake| load rake }
diff --git a/debian/patches/0004-Update_default_binary_path.patch b/debian/patches/0004-Update_default_binary_path.patch
index bd5b8ba..1b1ff05 100644
--- a/debian/patches/0004-Update_default_binary_path.patch
+++ b/debian/patches/0004-Update_default_binary_path.patch
@@ -5,14 +5,14 @@ Last-Update: 2015-06-19
 
 --- a/lib/cucumber/platform.rb
 +++ b/lib/cucumber/platform.rb
-@@ -5,8 +5,8 @@
+@@ -6,8 +6,8 @@
  module Cucumber
    unless defined?(Cucumber::VERSION)
-     VERSION       = '2.0.0'
+     VERSION       = File.read(File.expand_path("../version", __FILE__))
 -    BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
 -    LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
 +    BINARY        = '/usr/bin/cucumber'
 +    LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/..')
-     JRUBY         = defined?(JRUBY_VERSION)
-     WINDOWS       = RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
-     OS_X          = RbConfig::CONFIG['host_os'] =~ /darwin/
+     RAILS         = defined?(Rails)
+     RUBY_BINARY   = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+     RUBY_2_2      = RUBY_VERSION =~ /^2\.2/
diff --git a/debian/patches/0005-clean_bin_cucumber.patch b/debian/patches/0005-clean_bin_cucumber.patch
index 903c181..dacb7e5 100644
--- a/debian/patches/0005-clean_bin_cucumber.patch
+++ b/debian/patches/0005-clean_bin_cucumber.patch
@@ -1,4 +1,4 @@
-Description: do not modify the load path or try to load non existing files
+Description: do not modify the load path
  we remove everything relying on the layout of the gem, not the installed
  packaged
 Author: Cédric Boutillier <boutil at debian.org>
@@ -7,11 +7,9 @@ Last-Update: 2015-06-22
 
 --- a/bin/cucumber
 +++ b/bin/cucumber
-@@ -1,7 +1,4 @@
+@@ -1,5 +1,4 @@
  #!/usr/bin/env ruby
 -$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
--
--load File.expand_path(File.dirname(__FILE__) + '/../spec/simplecov_setup.rb')
  
+ require 'simplecov_setup'
  require 'cucumber/rspec/disable_option_parser'
- require 'cucumber/cli/main'

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