[DRE-commits] [SCM] ruby-yajl.git branch, master, updated. debian/0.8.3-2-11-g47e922d

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 47e922d9464e8b037e539503c6b3acdf99205862
Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
Date:   Tue Sep 27 13:42:28 2011 +0530

    add back description

diff --git a/debian/patches/001-encoding-spec-upstream-fix.patch b/debian/patches/001-encoding-spec-upstream-fix.patch
index 1b12737..62258be 100644
--- a/debian/patches/001-encoding-spec-upstream-fix.patch
+++ b/debian/patches/001-encoding-spec-upstream-fix.patch
@@ -1,3 +1,12 @@
+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

-- 
ruby-yajl.git