[DRE-commits] [ruby-oj] 02/03: refresh and fix extension of 02_avoid_name_conflict_with_ext.patch, drop 03_disable_deep_nest_test.patch

[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-oj.

commit 5b25c8863089d27220f4e071f3120d738477649c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jul 5 13:51:18 2013 +0200

    refresh and fix extension of 02_avoid_name_conflict_with_ext.patch, drop 03_disable_deep_nest_test.patch
---
 ...xt.rb => 02_avoid_name_conflict_with_ext.patch} |    6 +--
 debian/patches/03_disable_deep_nest_test.patch     |   41 --------------------
 debian/patches/series                              |    3 +-
 3 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/debian/patches/02_avoid_name_conflict_with_ext.rb b/debian/patches/02_avoid_name_conflict_with_ext.patch
similarity index 78%
rename from debian/patches/02_avoid_name_conflict_with_ext.rb
rename to debian/patches/02_avoid_name_conflict_with_ext.patch
index b7a2c64..216f3bb 100644
--- a/debian/patches/02_avoid_name_conflict_with_ext.rb
+++ b/debian/patches/02_avoid_name_conflict_with_ext.patch
@@ -1,13 +1,13 @@
 Description: Avoid confusion between library and binary extension
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: no
-Last-Update: 2013-03-20
+Last-Update: 2013-07-05
 
 --- a/lib/oj.rb
 +++ b/lib/oj.rb
-@@ -30,4 +30,4 @@
- require 'oj/mimic'
+@@ -31,4 +31,4 @@
  require 'oj/saj'
+ require 'oj/schandler'
  
 -require 'oj/oj' # C extension
 +require 'oj.so' # C extension
diff --git a/debian/patches/03_disable_deep_nest_test.patch b/debian/patches/03_disable_deep_nest_test.patch
deleted file mode 100644
index a361899..0000000
--- a/debian/patches/03_disable_deep_nest_test.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: disable test for deeply nested stream
- it fails when embedded in the gem2deb test framework
- but passes otherwise
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: no
-Last-Update: 2013-03-20
-
---- a/test/tests.rb
-+++ b/test/tests.rb
-@@ -894,18 +894,19 @@
-     assert_equal(h['b'].__id__, obj.__id__)
-   end
- 
--# Stream Deeply Nested
--  def test_deep_nest
--    unless 'jruby' == RUBY_DESCRIPTION.split(' ')[0]
--      begin
--        n = 100000
--        Oj.load('[' * n + ']' * n)
--        assert(false)
--      rescue Exception => e
--        assert(e.class == SystemStackError)
--      end
--    end
--  end
-+## Stream Deeply Nested
-+#  def test_deep_nest
-+#    unless 'jruby' == RUBY_DESCRIPTION.split(' ')[0]
-+#      begin
-+#        n = 100000
-+#        Oj.load('[' * n + ']' * n)
-+#        assert(false)
-+#      rescue Exception => e
-+#        puts e.class
-+#        assert(e.class == SystemStackError)
-+#      end
-+#    end
-+#  end
- 
- # Stream IO
-   def test_io_string
diff --git a/debian/patches/series b/debian/patches/series
index 27abc73..d0b6e42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01_dont_mess_with_loadpath.patch
-02_avoid_name_conflict_with_ext.rb
-03_disable_deep_nest_test.patch
+02_avoid_name_conflict_with_ext.patch

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