[DRE-commits] [ruby-multi-json] 04/05: Refresh patches

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-multi-json.

commit d973418da2c3ad8362a00aed1e68ca84842891de
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Sep 25 17:30:07 2013 +0200

    Refresh patches
---
 debian/patches/fix_encoding.patch     |   11 ++++++-----
 debian/patches/remove_simplecov.patch |   32 ++++++--------------------------
 2 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/debian/patches/fix_encoding.patch b/debian/patches/fix_encoding.patch
index 0e86ed3..ee6f0cc 100644
--- a/debian/patches/fix_encoding.patch
+++ b/debian/patches/fix_encoding.patch
@@ -5,12 +5,13 @@ Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: not-needed
 Last-Update: 2013-08-15
 
---- a/spec/adapter_shared_example.rb
-+++ b/spec/adapter_shared_example.rb
-@@ -1,4 +1,6 @@
+--- a/spec/shared/adapter.rb
++++ b/spec/shared/adapter.rb
+@@ -1,5 +1,7 @@
  # encoding: UTF-8
-+
+ 
 +Encoding.default_external="UTF-8" if defined? Encoding
++
+ require 'shared/options'
  
  shared_examples_for 'an adapter' do |adapter|
- 
diff --git a/debian/patches/remove_simplecov.patch b/debian/patches/remove_simplecov.patch
index 84fb9a5..034e8e3 100644
--- a/debian/patches/remove_simplecov.patch
+++ b/debian/patches/remove_simplecov.patch
@@ -4,31 +4,11 @@ Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: not-needed
 Last-Update: 2013-08-15
 
---- a/spec/helper.rb
-+++ b/spec/helper.rb
-@@ -1,14 +1,14 @@
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,4 +1,4 @@
 -require 'simplecov'
--require 'coveralls'
--
--SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
--  SimpleCov::Formatter::HTMLFormatter,
--  Coveralls::SimpleCov::Formatter
--]
--SimpleCov.start do
--  add_filter 'spec'
--  add_filter 'vendor'
--end
-+#require 'simplecov'
-+#require 'coveralls'
-+#
-+#SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-+#  SimpleCov::Formatter::HTMLFormatter,
-+#  Coveralls::SimpleCov::Formatter
-+#]
-+#SimpleCov.start do
-+#  add_filter 'spec'
-+#  add_filter 'vendor'
-+#end
++# require 'simplecov'
+ # require 'coveralls'
  
- require 'multi_json'
- require 'rspec'
+ # SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[

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