[DRE-commits] [ruby-multi-json] 03/07: remove skip-oj-tests.patch and (build)depend on ruby-oj

[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 57214cf094656af7280a8ae3ec1ccee96691bba9
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Aug 15 14:12:25 2013 +0200

    remove skip-oj-tests.patch and (build)depend on ruby-oj
---
 debian/control                     |    4 ++--
 debian/patches/series              |    1 -
 debian/patches/skip-oj-tests.patch |   15 ---------------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 81aa57a..7e10c3f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Laurent Bigonville <bigon at debian.org>, Antonio Terceiro <terceiro at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake, ruby-rspec, ruby-json, ruby-yajl
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), rake, ruby-rspec, ruby-json, ruby-yajl, ruby-oj
 Standards-Version: 3.9.3
 Vcs-Git: git://anonscm.debian.org/git/pkg-ruby-extras/ruby-multi-json.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-multi-json.git;a=summary
@@ -14,7 +14,7 @@ Package: ruby-multi-json
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Recommends: ruby-yajl (>= 1.0) | ruby-json (>= 1.4)
+Recommends: ruby-yajl (>= 1.0) | ruby-json (>= 1.4) | ruby-oj
 Description: Ruby library to provide easy switching between different JSON backends
  A Ruby library to provide easy switching between different JSON backends,
  including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem,
diff --git a/debian/patches/series b/debian/patches/series
index efe9e60..353cac9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-skip-oj-tests.patch
 remove_simplecov.patch
 fix_encoding.patch
diff --git a/debian/patches/skip-oj-tests.patch b/debian/patches/skip-oj-tests.patch
deleted file mode 100644
index 3691240..0000000
--- a/debian/patches/skip-oj-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Skip test that requires oj (not packaged)
- This patch is Debian-specific.
-Author: Antonio Terceiro <terceiro at debian.org>
-
---- ruby-multi-json-1.3.6.orig/spec/multi_json_spec.rb
-+++ ruby-multi-json-1.3.6/spec/multi_json_spec.rb
-@@ -48,7 +48,7 @@ describe 'MultiJson' do
-         require 'json'
-         MultiJson.adapter.name.should == 'MultiJson::Adapters::JsonGem'
-       end
--    end
-+    end if false
- 
-     it 'is settable via a symbol' do
-       MultiJson.use :json_gem

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