[DRE-commits] [SCM] ruby-yajl.git branch, master, updated. debian/1.0.0-1-9-g526eb05

[Per Andersson]

The following commit has been merged in the master branch:
commit 6f1ae311d074696fedc38f23ec1e78619b50b967
Author: Per Andersson <avtobiff at gmail.com>
Date:   Wed Jun 20 23:07:41 2012 +0200

    Remove 001-encoding-spec-upstream-fix.patch
    
    Merged upstream.

diff --git a/debian/patches/001-encoding-spec-upstream-fix.patch b/debian/patches/001-encoding-spec-upstream-fix.patch
deleted file mode 100644
index 62258be..0000000
--- a/debian/patches/001-encoding-spec-upstream-fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Brian Lopez - https://github.com/brianmario
-Subject: make sure to_json doesn't exist 
-
-* ext/yajl/yajl_ext.c
-* spec/encoding/encoding_spec.rb
-
-Origin: upstream, https://github.com/brianmario/yajl-ruby/commit/527f486a6754a7
-Bug: https://github.com/brianmario/yajl-ruby/issues/83
-
-diff --git a/spec/encoding/encoding_spec.rb b/spec/encoding/encoding_spec.rb
-index f889a9b..b02c2e0 100644
---- a/spec/encoding/encoding_spec.rb
-+++ b/spec/encoding/encoding_spec.rb
-@@ -9,13 +9,13 @@ end
- 
- class TheMindKiller
-   def to_json
--    @wait_i_dont_exist_this_is_a_horrible_mistake_dont_do_it_aiiiiiiiiieeeeeee
-+    nil
-   end
- end
- 
- class TheMindKillerDuce
-   def to_s
--    @wait_i_dont_exist_this_is_a_horrible_mistake_dont_do_it_aiiiiiiiiieeeeeee
-+    nil
-   end
- end
- 
-@@ -265,6 +265,9 @@ describe "Yajl JSON encoder" do
- 
-   it "return value of #to_s must be a string" do
-     lambda {
-+      if TheMindKillerDuce.send(:method_defined?, :to_json)
-+        TheMindKillerDuce.send(:undef_method, :to_json)
-+      end
-       Yajl::Encoder.encode(TheMindKillerDuce.new)
-     }.should raise_error(TypeError)
-   end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ee73397..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-001-encoding-spec-upstream-fix.patch

-- 
ruby-yajl.git