[DRE-commits] [ruby-aruba] 95/98: refresh patches

[Hideki Yamane]

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

henrich pushed a commit to branch debian/sid
in repository ruby-aruba.

commit 51dbf2987c0f1ac7f3724cbbbcc1414b1d1f2360
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Mar 22 21:11:30 2016 +0900

    refresh patches
---
 debian/changelog                                                 | 2 ++
 debian/patches/0004-add-require-time-to-avoid-test-failure.patch | 6 ++----
 debian/patches/003_disable-simplecov-during-tests.patch          | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb99e93..b3cf8c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ruby-aruba (0.14.1-1) UNRELEASED; urgency=medium
   * debian/control
     - use https for Vcs-Git
     - set Standards-Version: 3.9.7
+  * debian/patches
+    - refresh patches
 
  -- Hideki Yamane <henrich at debian.org>  Tue, 22 Mar 2016 21:07:28 +0900
 
diff --git a/debian/patches/0004-add-require-time-to-avoid-test-failure.patch b/debian/patches/0004-add-require-time-to-avoid-test-failure.patch
index 5ffc08a..bce274b 100644
--- a/debian/patches/0004-add-require-time-to-avoid-test-failure.patch
+++ b/debian/patches/0004-add-require-time-to-avoid-test-failure.patch
@@ -9,15 +9,13 @@ fix
  spec/aruba/api_spec.rb | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/spec/aruba/api_spec.rb b/spec/aruba/api_spec.rb
-index 97f9e3f..32e77ad 100644
 --- a/spec/aruba/api_spec.rb
 +++ b/spec/aruba/api_spec.rb
-@@ -2,6 +2,7 @@ require 'spec_helper'
+@@ -2,6 +2,7 @@
  require 'securerandom'
  require 'aruba/api'
  require 'fileutils'
 +require 'time'
  
- describe Aruba::Api  do
+ describe Aruba::Api do
    include_context 'uses aruba API'
diff --git a/debian/patches/003_disable-simplecov-during-tests.patch b/debian/patches/003_disable-simplecov-during-tests.patch
index 7219e1a..0d99489 100644
--- a/debian/patches/003_disable-simplecov-during-tests.patch
+++ b/debian/patches/003_disable-simplecov-during-tests.patch
@@ -7,8 +7,6 @@ Subject: _disable-simplecov-during-tests
  spec/spec_helper.rb | 8 --------
  1 file changed, 8 deletions(-)
 
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index a3a213b..d3a002c 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -2,14 +2,6 @@
@@ -23,6 +21,6 @@ index a3a213b..d3a002c 100644
 -require 'bundler'
 -Bundler.require
 -
- # Activate RSpec Integration
- require 'aruba/rspec'
- 
+ # Loading support files
+ if RUBY_VERSION < '1.9'
+   Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }

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