[DRE-commits] [cucumber] 04/11: refresh patches

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository cucumber.

commit a4fce2c42e51e12f7c1f6dba99508664c376c10d
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Aug 13 21:57:15 2013 +0200

    refresh patches
---
 .../0001-Remove-rubygems-bundler-stuff-from-spec_helper.patch |    9 ++-------
 .../patches/0003-Disable-tests-assuming-ordered-hashes.patch  |    6 +++---
 debian/patches/0004-Update_default_binary_path.patch          |    2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0001-Remove-rubygems-bundler-stuff-from-spec_helper.patch b/debian/patches/0001-Remove-rubygems-bundler-stuff-from-spec_helper.patch
index 96adc78..042202a 100644
--- a/debian/patches/0001-Remove-rubygems-bundler-stuff-from-spec_helper.patch
+++ b/debian/patches/0001-Remove-rubygems-bundler-stuff-from-spec_helper.patch
@@ -7,11 +7,9 @@ Subject: [PATCH 1/2] Remove rubygems/bundler stuff from spec_helper
  spec/spec_helper.rb |    4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)
 
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 8b25fdf..bd52a01 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -8,10 +8,6 @@ if defined? Encoding
+@@ -8,10 +8,6 @@
    Encoding.default_internal = 'utf-8'
  end
  
@@ -20,8 +18,5 @@ index 8b25fdf..bd52a01 100644
 -Bundler.setup
 -
  require 'cucumber'
- $KCODE='u' unless Cucumber::RUBY_1_9
+ $KCODE='u' if Cucumber::RUBY_1_8_7
  
--- 
-1.7.5.4
-
diff --git a/debian/patches/0003-Disable-tests-assuming-ordered-hashes.patch b/debian/patches/0003-Disable-tests-assuming-ordered-hashes.patch
index 26ad1cf..2f5601b 100644
--- a/debian/patches/0003-Disable-tests-assuming-ordered-hashes.patch
+++ b/debian/patches/0003-Disable-tests-assuming-ordered-hashes.patch
@@ -6,7 +6,7 @@ Last-Update: 2011-06-20
 
 --- a/spec/cucumber/ast/table_spec.rb
 +++ b/spec/cucumber/ast/table_spec.rb
-@@ -491,7 +491,7 @@
+@@ -512,7 +512,7 @@
        end
  
        describe "#new" do
@@ -14,10 +14,10 @@ Last-Update: 2011-06-20
 +        xit "should allow Array of Hash" do
            t1 = Table.new([{'name' => 'aslak', 'male' => 'true'}])
            t1.to_s(:indent => 12, :color => false).should == %{
-             |     name  |     male |
+             |     male |     name  |
 --- a/spec/cucumber/cli/configuration_spec.rb
 +++ b/spec/cucumber/cli/configuration_spec.rb
-@@ -167,7 +167,7 @@
+@@ -168,7 +168,7 @@
          config.options[:require].should include('some_file')
        end
  
diff --git a/debian/patches/0004-Update_default_binary_path.patch b/debian/patches/0004-Update_default_binary_path.patch
index 971ebcd..0f384df 100644
--- a/debian/patches/0004-Update_default_binary_path.patch
+++ b/debian/patches/0004-Update_default_binary_path.patch
@@ -8,7 +8,7 @@ Last-Update: 2013-08-13
 @@ -5,8 +5,8 @@
  module Cucumber
  unless defined?(Cucumber::VERSION)
-   VERSION       = '1.2.1'
+   VERSION       = '1.3.6'
 -  BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
 -  LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
 +  BINARY        = '/usr/bin/cucumber'

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