[DRE-commits] [ruby-multi-json] 02/07: patches: remove simplecov from tests, fix encoding

[Cédric Boutillier]

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

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

commit d78a65e7d760f64c06135e664c56e4e45e1b460f
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Aug 15 14:10:49 2013 +0200

    patches: remove simplecov from tests, fix encoding
---
 debian/patches/fix_encoding.patch     |   16 ++++++++++++++++
 debian/patches/remove_simplecov.patch |   34 +++++++++++++++++++++++++++++++++
 debian/patches/series                 |    2 ++
 3 files changed, 52 insertions(+)

diff --git a/debian/patches/fix_encoding.patch b/debian/patches/fix_encoding.patch
new file mode 100644
index 0000000..0e86ed3
--- /dev/null
+++ b/debian/patches/fix_encoding.patch
@@ -0,0 +1,16 @@
+Description: force default external encoding to UTF-8
+ This is needed for building environment with C locale
+Origin: vendor
+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 @@
+ # encoding: UTF-8
++
++Encoding.default_external="UTF-8" if defined? Encoding
+ 
+ shared_examples_for 'an adapter' do |adapter|
+ 
diff --git a/debian/patches/remove_simplecov.patch b/debian/patches/remove_simplecov.patch
new file mode 100644
index 0000000..84fb9a5
--- /dev/null
+++ b/debian/patches/remove_simplecov.patch
@@ -0,0 +1,34 @@
+Description: remove simplecov requirement
+Origin: vendor
+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 @@
+-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 'multi_json'
+ require 'rspec'
diff --git a/debian/patches/series b/debian/patches/series
index 26903ce..efe9e60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 skip-oj-tests.patch
+remove_simplecov.patch
+fix_encoding.patch

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