[DRE-commits] [ruby-mustache] 02/03: adapt fix-encoding for Ruby 2.0 (Closes: #720239)

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

commit 57045b732b6e5e29cc60da9ca99d6e9c375e8d98
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Oct 25 16:50:07 2013 +0200

    adapt fix-encoding for Ruby 2.0 (Closes: #720239)
---
 debian/patches/fix-encoding |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/debian/patches/fix-encoding b/debian/patches/fix-encoding
index a4a66f9..5f61b84 100644
--- a/debian/patches/fix-encoding
+++ b/debian/patches/fix-encoding
@@ -1,22 +1,17 @@
-Description: Fix encoding error in test suite 1.9
+Description: Fix encoding error in test suite with Ruby 1.9 and 2.0
  Fixes a failing test with Ruby 1.9
-
----
-
 Origin: vendor
 Forwarded: no
 Reviewed-By: Cédric Boutillier <cedric.boutillier at gmail.com>
-Last-Update: 2011-10-08
+Last-Update: 2013-10-25
 
 --- a/test/mustache_test.rb
 +++ b/test/mustache_test.rb
-@@ -1,5 +1,10 @@
+@@ -1,5 +1,8 @@
  # -*- coding: utf-8 -*-
  $LOAD_PATH.unshift File.dirname(__FILE__)
 +
-+if RUBY_VERSION =~ /1.9/
-+      Encoding.default_external = Encoding::UTF_8
-+end
++Encoding.default_external = Encoding::UTF_8 if defined? Encoding
 +
  require 'helper'
  

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