[DRE-commits] [ruby-simplecov] 04/06: Refresh patches

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-simplecov.

commit efa359cbaf19573533e1e26a3334316e11816983
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Dec 14 10:41:47 2015 -0200

    Refresh patches
---
 debian/changelog                                  |  1 +
 debian/patches/dont-mess-with-the-load-path.patch |  2 +-
 debian/patches/fix-test-suite.patch               | 20 +++++++-------
 debian/patches/remove-rubygems-bundler.patch      | 33 ++++++++++++++++-------
 debian/patches/series                             |  1 -
 5 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe7410f..955e1bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ruby-simplecov (0.11.1-1) UNRELEASED; urgency=medium
   * Update packaging with a new dh-make-ruby run
    - upstream switched to rspec; dropping build dependencies on minitest and
      shoulda
+  * Refresh patches
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 14 Dec 2015 10:25:45 -0200
 
diff --git a/debian/patches/dont-mess-with-the-load-path.patch b/debian/patches/dont-mess-with-the-load-path.patch
index 6b014f3..cbe61a1 100644
--- a/debian/patches/dont-mess-with-the-load-path.patch
+++ b/debian/patches/dont-mess-with-the-load-path.patch
@@ -1,6 +1,6 @@
 --- a/lib/simplecov.rb
 +++ b/lib/simplecov.rb
-@@ -131,7 +131,6 @@ module SimpleCov
+@@ -148,7 +148,6 @@ module SimpleCov
    end
  end
  
diff --git a/debian/patches/fix-test-suite.patch b/debian/patches/fix-test-suite.patch
index 13746ea..5c2a62b 100644
--- a/debian/patches/fix-test-suite.patch
+++ b/debian/patches/fix-test-suite.patch
@@ -6,8 +6,8 @@ Forwarded: not-needed
 Last-Update: 2015-09-15
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/fixtures/deleted_source_sample.rb
-+++ b/test/fixtures/deleted_source_sample.rb
+--- a/spec/fixtures/deleted_source_sample.rb
++++ b/spec/fixtures/deleted_source_sample.rb
 @@ -1,5 +1,4 @@
 -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", ".."))
 -require "lib/simplecov"
@@ -15,8 +15,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  SimpleCov.start { command_name "Test" }
  
  dir = File.expand_path(File.dirname(__FILE__))
---- a/test/fixtures/frameworks/rspec_bad.rb
-+++ b/test/fixtures/frameworks/rspec_bad.rb
+--- a/spec/fixtures/frameworks/rspec_bad.rb
++++ b/spec/fixtures/frameworks/rspec_bad.rb
 @@ -1,5 +1,4 @@
 -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
 -require "lib/simplecov"
@@ -24,8 +24,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  require "rspec"
  SimpleCov.start
  describe "exit status" do
---- a/test/fixtures/frameworks/rspec_good.rb
-+++ b/test/fixtures/frameworks/rspec_good.rb
+--- a/spec/fixtures/frameworks/rspec_good.rb
++++ b/spec/fixtures/frameworks/rspec_good.rb
 @@ -1,5 +1,4 @@
 -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
 -require "lib/simplecov"
@@ -33,8 +33,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  require "rspec"
  SimpleCov.start
  describe "exit status" do
---- a/test/fixtures/frameworks/testunit_bad.rb
-+++ b/test/fixtures/frameworks/testunit_bad.rb
+--- a/spec/fixtures/frameworks/testunit_bad.rb
++++ b/spec/fixtures/frameworks/testunit_bad.rb
 @@ -1,5 +1,4 @@
 -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
 -require "lib/simplecov"
@@ -42,8 +42,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  SimpleCov.start
  require "test/unit"
  class FooTest < Test::Unit::TestCase
---- a/test/fixtures/frameworks/testunit_good.rb
-+++ b/test/fixtures/frameworks/testunit_good.rb
+--- a/spec/fixtures/frameworks/testunit_good.rb
++++ b/spec/fixtures/frameworks/testunit_good.rb
 @@ -1,5 +1,4 @@
 -$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "..", ".."))
 -require "lib/simplecov"
diff --git a/debian/patches/remove-rubygems-bundler.patch b/debian/patches/remove-rubygems-bundler.patch
index ac7b090..6bc162f 100644
--- a/debian/patches/remove-rubygems-bundler.patch
+++ b/debian/patches/remove-rubygems-bundler.patch
@@ -3,18 +3,31 @@ Description: Remove bundler
 Author: Praveen Arimbrathodiyil <praveen at debian.org>
 Last-updated: 2013-05-23
 
---- a/test/helper.rb
-+++ b/test/helper.rb
+--- a/spec/faked_project/Rakefile
++++ b/spec/faked_project/Rakefile
+@@ -1,4 +1,3 @@
+-require "bundler"
+ 
+ require "rake/testtask"
+ Rake::TestTask.new(:test) do |test|
+--- a/spec/faked_project/features/support/env.rb
++++ b/spec/faked_project/features/support/env.rb
+@@ -1,4 +1,3 @@
+-require "bundler/setup"
+ 
+ # We're injecting simplecov_config via aruba in cucumber here
+ # depending on what the test case is...
+--- a/spec/faked_project/spec/spec_helper.rb
++++ b/spec/faked_project/spec/spec_helper.rb
 @@ -1,4 +1,3 @@
 -require "bundler/setup"
- require "simplecov"
- require "minitest/autorun"
- require "shoulda"
---- a/test/faked_project/test/test_helper.rb
-+++ b/test/faked_project/test/test_helper.rb
-@@ -1,5 +1,3 @@
+ 
+ # We're injecting simplecov_config via aruba in cucumber here
+ # depending on what the test case is...
+--- a/spec/faked_project/test/test_helper.rb
++++ b/spec/faked_project/test/test_helper.rb
+@@ -1,4 +1,3 @@
 -require "bundler/setup"
--
+ 
  # We're injecting simplecov_config via aruba in cucumber here
  # depending on what the test case is...
- begin
diff --git a/debian/patches/series b/debian/patches/series
index 3c68580..36a54e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 remove-rubygems-bundler.patch
-skip-broken-test.patch
 fix-test-suite.patch
 dont-mess-with-the-load-path.patch

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