[DRE-commits] [ruby-magic] 03/06: disable test on ruby 1.8

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository ruby-magic.

commit a104e536c8dbb463ecf878dffe3fcf1796e1ec38
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Aug 13 12:12:17 2013 +0200

    disable test on ruby 1.8
---
 .../0001-Fix-Magic.guess_string_mime_encoding.patch      |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/debian/patches/0001-Fix-Magic.guess_string_mime_encoding.patch b/debian/patches/0001-Fix-Magic.guess_string_mime_encoding.patch
index 9417609..e4a86f3 100644
--- a/debian/patches/0001-Fix-Magic.guess_string_mime_encoding.patch
+++ b/debian/patches/0001-Fix-Magic.guess_string_mime_encoding.patch
@@ -1,16 +1,17 @@
 From 1d6c5770bd1cf107d3067c353689bda1634c97a4 Mon Sep 17 00:00:00 2001
 From: Antonio Terceiro <terceiro at softwarelivre.org>
 Date: Tue, 13 Aug 2013 11:39:16 +0200
-Subject: [PATCH] Fix Magic.guess_string_mime_encoding
 Forwarded: https://github.com/qoobaa/magic/pull/2
+Subject: [PATCH] Fix Magic.guess_string_mime_encoding
+ This patch is sligthly modified from the version submitted upstream to disable
+ the test on Ruby 1.8 (which upstream probably doesn not care at this point
+ anymore)
 
 ---
  lib/magic.rb       | 2 +-
  test/test_magic.rb | 8 ++++++++
  2 files changed, 9 insertions(+), 1 deletion(-)
 
-diff --git a/lib/magic.rb b/lib/magic.rb
-index 53d84ce..9360b43 100644
 --- a/lib/magic.rb
 +++ b/lib/magic.rb
 @@ -52,7 +52,7 @@ module Magic
@@ -22,8 +23,6 @@ index 53d84ce..9360b43 100644
      end
  
      # Guesses mime type of given string
-diff --git a/test/test_magic.rb b/test/test_magic.rb
-index 0a5954b..88ad9e8 100644
 --- a/test/test_magic.rb
 +++ b/test/test_magic.rb
 @@ -1,3 +1,5 @@
@@ -40,9 +39,6 @@ index 0a5954b..88ad9e8 100644
 +  test "guess encoding from string" do
 +    utf8 = "utf-8".force_encoding(Encoding::ASCII_8BIT)
 +    assert_equal utf8, Magic.guess_string_mime_encoding('áéíóú')
-+  end
++  end if RUBY_VERSION > '1.9'
 +
  end
--- 
-1.8.4.rc2
-

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