[DRE-commits] [SCM] ruby-ogginfo.git branch, master, updated. upstream/0.6.5-5-g0f4cc43

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 0f4cc4319e967ab873be88829bda1d0dbc6bf14b
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Thu Aug 11 18:25:07 2011 -0500

    Of course, when fixing 1.9.1 take care not to break 1.8

diff --git a/debian/patches/encoding_fixes_for_1.9.1 b/debian/patches/encoding_fixes_for_1.9.1
index 219d18b..4ecdfbf 100644
--- a/debian/patches/encoding_fixes_for_1.9.1
+++ b/debian/patches/encoding_fixes_for_1.9.1
@@ -6,26 +6,30 @@ Description: Fix an encoding issue breaking all tests under Ruby 1.9.1
  as an array of (encoding-aware) characters. This forces a string to
  be built as a series of bytes, and allows the tests to pass.
 
-Index: ruby-ogginfo/test/test_ruby-ogginfo.rb
+Index: ruby-ogginfo-0.6.5/test/test_ruby-ogginfo.rb
 ===================================================================
---- ruby-ogginfo.orig/test/test_ruby-ogginfo.rb	2011-08-11 18:09:16.000000000 -0500
-+++ ruby-ogginfo/test/test_ruby-ogginfo.rb	2011-08-11 18:09:21.000000000 -0500
-@@ -146,7 +146,10 @@
+--- ruby-ogginfo-0.6.5.orig/test/test_ruby-ogginfo.rb	2011-08-11 18:18:55.000000000 -0500
++++ ruby-ogginfo-0.6.5/test/test_ruby-ogginfo.rb	2011-08-11 18:23:28.000000000 -0500
+@@ -146,7 +146,14 @@
      end
  
      OggInfo.open(tf.path, "iso-8859-1") do |ogg|
 -      assert_equal "hello\xe9", ogg.tag["title"] 
-+      string = ''
-+      string.force_encoding 'iso-8859-1'
-+      [104, 101, 108, 108, 111, 233].each {|chr| string << chr}
-+      assert_equal string, ogg.tag["title"] 
++      if RUBY_VERSION[0..2] == '1.8'
++        assert_equal "hello\xe9", ogg.tag["title"] 
++      else
++        string = ''
++        string.force_encoding 'iso-8859-1'
++        [104, 101, 108, 108, 111, 233].each {|chr| string << chr}
++        assert_equal string, ogg.tag["title"] 
++      end
      end
    end
  
-Index: ruby-ogginfo/test/test_ruby-spxinfo.rb
+Index: ruby-ogginfo-0.6.5/test/test_ruby-spxinfo.rb
 ===================================================================
---- ruby-ogginfo.orig/test/test_ruby-spxinfo.rb	2011-08-11 18:09:16.000000000 -0500
-+++ ruby-ogginfo/test/test_ruby-spxinfo.rb	2011-08-11 18:09:21.000000000 -0500
+--- ruby-ogginfo-0.6.5.orig/test/test_ruby-spxinfo.rb	2011-08-11 18:18:55.000000000 -0500
++++ ruby-ogginfo-0.6.5/test/test_ruby-spxinfo.rb	2011-08-11 18:19:10.000000000 -0500
 @@ -91,12 +91,33 @@
    def test_charset
      generate_spx

-- 
ruby-ogginfo.git