[DRE-commits] [ruby-mustache] 04/09: d/patches: Refresh fix-encoding patch and a prefix number

[Sebastien Badia]

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

sbadia-guest pushed a commit to branch master
in repository ruby-mustache.

commit 23e48a0ad29677ba858b17a2ee91f9b8eba377cd
Author: Sebastien Badia <seb at sebian.fr>
Date:   Fri Apr 10 16:42:36 2015 +0200

    d/patches: Refresh fix-encoding patch and a prefix number
---
 debian/patches/001_fix-encoding.patch | 19 +++++++++++++++++++
 debian/patches/fix-encoding           | 18 ------------------
 debian/patches/series                 |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/debian/patches/001_fix-encoding.patch b/debian/patches/001_fix-encoding.patch
new file mode 100644
index 0000000..5d931d1
--- /dev/null
+++ b/debian/patches/001_fix-encoding.patch
@@ -0,0 +1,19 @@
+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
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Reviewed-By: Sebastien Badia <seb at sebian.fr>
+Last-Update: 2015-04-10
+
+--- ruby-mustache-1.0.1.orig/test/mustache_test.rb
++++ ruby-mustache-1.0.1/test/mustache_test.rb
+@@ -1,6 +1,8 @@
+ # -*- coding: utf-8 -*-
+ require_relative 'helper'
+ 
++Encoding.default_external = Encoding::UTF_8 if defined? Encoding
++
+ class MustacheTest < Minitest::Test
+   def test_instance_render
+     klass = Class.new(Mustache)
diff --git a/debian/patches/fix-encoding b/debian/patches/fix-encoding
deleted file mode 100644
index 5f61b84..0000000
--- a/debian/patches/fix-encoding
+++ /dev/null
@@ -1,18 +0,0 @@
-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: 2013-10-25
-
---- a/test/mustache_test.rb
-+++ b/test/mustache_test.rb
-@@ -1,5 +1,8 @@
- # -*- coding: utf-8 -*-
- $LOAD_PATH.unshift File.dirname(__FILE__)
-+
-+Encoding.default_external = Encoding::UTF_8 if defined? Encoding
-+
- require 'helper'
- 
- class MustacheTest < Test::Unit::TestCase
diff --git a/debian/patches/series b/debian/patches/series
index 28481ff..044a107 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-fix-encoding
+001_fix-encoding.patch

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