[DRE-commits] [SCM] ruby-multi-json.git branch, master, updated. debian/1.3.1-2-9-g17d7675

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 730a96289855f2c1f51865d66aab42facf67023a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Jun 26 13:27:25 2012 -0300

    Skip tests that require a non-packaged library

diff --git a/debian/changelog b/debian/changelog
index 3ee1514..fd7c11a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ruby-multi-json (1.3.6-1) unstable; urgency=low
   * New upstream release.
   * debian/control: add myself to Uploaders:
   * Run tests during build; added rake to Build-Depends:
+  * debian/patches/skip-oj-tests.patch: skip test that requires a non-
+    packaged JSON library
 
  -- Antonio Terceiro <terceiro at debian.org>  Tue, 26 Jun 2012 13:16:21 -0300
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..26903ce
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+skip-oj-tests.patch
diff --git a/debian/patches/skip-oj-tests.patch b/debian/patches/skip-oj-tests.patch
new file mode 100644
index 0000000..3691240
--- /dev/null
+++ b/debian/patches/skip-oj-tests.patch
@@ -0,0 +1,15 @@
+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

-- 
ruby-multi-json.git