[DRE-commits] [ruby-simplecov] 03/11: 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 83a6ef80cda75ee41729dd879b006f243ef493ab
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Sep 15 11:55:34 2015 -0300

    Refresh patches
---
 debian/changelog                             |  2 ++
 debian/patches/ignore-simplecov-html         | 35 ++++++++++------------------
 debian/patches/remove-rubygems-bundler.patch | 25 +++++++-------------
 debian/patches/series                        |  1 -
 4 files changed, 23 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d141ba..f88c66b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ruby-simplecov (0.10.0-1) UNRELEASED; urgency=medium
 
+  * Team upload.
   * New upstream release (Closes: #768957)
+  * Refresh patches
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 15 Sep 2015 11:26:34 -0300
 
diff --git a/debian/patches/ignore-simplecov-html b/debian/patches/ignore-simplecov-html
index 0a08db1..886d509 100644
--- a/debian/patches/ignore-simplecov-html
+++ b/debian/patches/ignore-simplecov-html
@@ -4,32 +4,21 @@ Author: Christian Hofstaedtler <zeha at debian.org>
 Last-updated: 2013-12-23
 
 
-Index: ruby-simplecov/lib/simplecov/defaults.rb
-===================================================================
---- ruby-simplecov.orig/lib/simplecov/defaults.rb	2013-12-23 23:58:40.661796884 +0100
-+++ ruby-simplecov/lib/simplecov/defaults.rb	2013-12-23 23:58:40.653796910 +0100
-@@ -1,5 +1,9 @@
- # Load default formatter gem
--require 'simplecov-html'
-+begin
-+  require 'simplecov-html'
-+rescue LoadError
-+  puts "Loading simplecov-html failed, install ruby-simplecov-html"
-+end
- 
- SimpleCov.adapters.define 'root_filter' do
+--- a/lib/simplecov/defaults.rb
++++ b/lib/simplecov/defaults.rb
+@@ -1,6 +1,3 @@
+-# Load default formatter gem
+-require "simplecov-html"
+-
+ SimpleCov.profiles.define "root_filter" do
    # Exclude all files outside of simplecov root
-@@ -32,7 +36,12 @@ end
+   add_filter do |src|
+@@ -34,7 +31,7 @@ end
  
  # Default configuration
  SimpleCov.configure do
 -  formatter SimpleCov::Formatter::HTMLFormatter
-+  begin
-+    formatter SimpleCov::Formatter::HTMLFormatter
-+  rescue NameError
-+    # simplecov-html not installed, fall back to SimpleFormatter
-+    formatter SimpleCov::Formatter::SimpleFormatter
-+  end
++  formatter SimpleCov::Formatter::SimpleFormatter
+   load_profile "bundler_filter"
    # Exclude files outside of SimpleCov.root
-   load_adapter 'root_filter'
- end
+   load_profile "root_filter"
diff --git a/debian/patches/remove-rubygems-bundler.patch b/debian/patches/remove-rubygems-bundler.patch
index d80124c..ac7b090 100644
--- a/debian/patches/remove-rubygems-bundler.patch
+++ b/debian/patches/remove-rubygems-bundler.patch
@@ -5,23 +5,16 @@ Last-updated: 2013-05-23
 
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -1,7 +1,10 @@
--require 'bundler/setup'
-+#require 'bundler/setup'
- require 'simplecov'
- require 'test/unit'
- require 'shoulda'
-+if RUBY_VERSION =~ 1.9
-+	require 'minitest/autorun'
-+end
- 
- SimpleCov.coverage_dir('tmp/coverage')
- 
+@@ -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,4 +1,4 @@
--require 'bundler/setup'
-+# require 'bundler/setup'
- 
+@@ -1,5 +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 4d5e552..94a931a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 remove-rubygems-bundler.patch
 ignore-simplecov-html
-open-source-files-in-binary-mode

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