[DRE-commits] [ruby-aruba] 06/07: patchs, remove un-needed patchs and clean

[Sebastien Badia]

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

sbadia-guest pushed a commit to branch master
in repository ruby-aruba.

commit 890772534ad2ce2a3532d3cba0c5cca23b94aa9e
Author: Sebastien Badia <seb at sebian.fr>
Date:   Thu Aug 20 15:58:49 2015 +0200

    patchs, remove un-needed patchs and clean
---
 ..._rubygems => 001_remove-require-rubygems.patch} |  0
 ...h => 002_path-manipulation-for-templates.patch} |  8 +++++---
 .../003_disable-simplecov-during-tests.patch       | 22 ++++++++++++++++++++++
 debian/patches/series                              |  6 +++---
 debian/patches/specify_spec_helper.rb              | 16 ----------------
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/debian/patches/remove_require_rubygems b/debian/patches/001_remove-require-rubygems.patch
similarity index 100%
rename from debian/patches/remove_require_rubygems
rename to debian/patches/001_remove-require-rubygems.patch
diff --git a/debian/patches/path-manipulation-for-templates.patch b/debian/patches/002_path-manipulation-for-templates.patch
similarity index 72%
rename from debian/patches/path-manipulation-for-templates.patch
rename to debian/patches/002_path-manipulation-for-templates.patch
index 2b8f404..ce924d7 100644
--- a/debian/patches/path-manipulation-for-templates.patch
+++ b/debian/patches/002_path-manipulation-for-templates.patch
@@ -7,10 +7,12 @@ Forwarded: no
 
 --- a/lib/aruba/reporting.rb
 +++ b/lib/aruba/reporting.rb
-@@ -1,5 +1,5 @@
- if(ENV['ARUBA_REPORT_DIR'])
+@@ -4,7 +4,7 @@ if(ENV['ARUBA_REPORT_DIR'])
+   require 'aruba/platform'
+   Aruba.platform.deprecated 'The use of "aruba/reporting" is deprecated. This functionality will be removed with "1.0.0"'
+ 
 -  ENV['ARUBA_REPORT_TEMPLATES'] ||= File.dirname(__FILE__) + '/../../templates'
 +  ENV['ARUBA_REPORT_TEMPLATES'] ||= File.dirname(__FILE__) + '/../../../../share/ruby-aruba/templates'
-   
+ 
    require 'fileutils'
    require 'erb'
diff --git a/debian/patches/003_disable-simplecov-during-tests.patch b/debian/patches/003_disable-simplecov-during-tests.patch
new file mode 100644
index 0000000..12152aa
--- /dev/null
+++ b/debian/patches/003_disable-simplecov-during-tests.patch
@@ -0,0 +1,22 @@
+Description: Disable simplecov and bundler
+Author: Sebastien Badia <seb at sebian.fr>
+Forwarded: not-needed
+Last-Update: 2015-08-20
+
+--- ruby-aruba-0.9.0.orig/spec/spec_helper.rb
++++ ruby-aruba-0.9.0/spec/spec_helper.rb
+@@ -2,14 +2,6 @@
+ 
+ $LOAD_PATH << ::File.expand_path('../../lib', __FILE__)
+ 
+-require 'simplecov'
+-SimpleCov.command_name 'rspec'
+-SimpleCov.start
+-
+-# Pull in all of the gems including those in the `test` group
+-require 'bundler'
+-Bundler.require
+-
+ # Activate RSpec Integration
+ require 'aruba/rspec'
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ad92dab..3b26d31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-remove_require_rubygems
-specify_spec_helper.rb
-path-manipulation-for-templates.patch
+001_remove-require-rubygems.patch
+002_path-manipulation-for-templates.patch
+003_disable-simplecov-during-tests.patch
diff --git a/debian/patches/specify_spec_helper.rb b/debian/patches/specify_spec_helper.rb
deleted file mode 100644
index 5b0d69e..0000000
--- a/debian/patches/specify_spec_helper.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: just specify spec_helper.rb in parent directory
-Author: Hideki Yamane <henrich at debian.org>
-
----
-Origin: vendor
-Forwarded: no
-Last-Update: 2013-01-03
-
---- ruby-aruba-0.5.1.orig/spec/aruba/api_spec.rb
-+++ ruby-aruba-0.5.1/spec/aruba/api_spec.rb
-@@ -1,4 +1,4 @@
--require 'spec_helper'
-+require './spec/spec_helper'
- 
- describe Aruba::Api  do
- 

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