[DRE-commits] [ruby-tilt] 02/05: Refresh patches

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-tilt.

commit b5d43b019a52e3676f9dde3828b1ae23a955293d
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Jan 31 01:03:07 2014 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 .../patches/0001-Drop-bundler-dependencies.patch   | 22 ++++++++++++++++++++++
 debian/patches/0002-Force-Encoding-ERB-Test.patch  | 21 +++++++++++++++++++++
 debian/patches/force_encoding_erb_test             | 20 --------------------
 debian/patches/series                              |  3 ++-
 4 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/debian/patches/0001-Drop-bundler-dependencies.patch b/debian/patches/0001-Drop-bundler-dependencies.patch
new file mode 100644
index 0000000..78696ff
--- /dev/null
+++ b/debian/patches/0001-Drop-bundler-dependencies.patch
@@ -0,0 +1,22 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Fri, 31 Jan 2014 01:04:23 +0900
+Subject: Drop bundler dependencies
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/test_helper.rb | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/test/test_helper.rb b/test/test_helper.rb
+index e43beee..75a7808 100644
+--- a/test/test_helper.rb
++++ b/test/test_helper.rb
+@@ -1,8 +1,3 @@
+-$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+-
+-require 'bundler'
+-Bundler.setup
+-
+ require 'minitest/autorun'
+ require 'minitest/mock'
+ 
diff --git a/debian/patches/0002-Force-Encoding-ERB-Test.patch b/debian/patches/0002-Force-Encoding-ERB-Test.patch
new file mode 100644
index 0000000..9deb0c6
--- /dev/null
+++ b/debian/patches/0002-Force-Encoding-ERB-Test.patch
@@ -0,0 +1,21 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Fri, 31 Jan 2014 01:12:49 +0900
+Subject: Force Encoding ERB Test
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/tilt_template_test.rb | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test/tilt_template_test.rb b/test/tilt_template_test.rb
+index e4d1508..ea704ad 100644
+--- a/test/tilt_template_test.rb
++++ b/test/tilt_template_test.rb
+@@ -1,4 +1,7 @@
+ # coding: utf-8
++if RUBY_VERSION >= '1.9.1'
++    Encoding.default_external = "UTF-8"
++end
+ require 'test_helper'
+ require 'tilt'
+ require 'tilt/template'
diff --git a/debian/patches/force_encoding_erb_test b/debian/patches/force_encoding_erb_test
deleted file mode 100644
index 93f7b50..0000000
--- a/debian/patches/force_encoding_erb_test
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Add Encoding.default_external to tilt_erbtemplate_test.rb
- When locate is not set or LANG=C, tilt_erbtemplate_test.rb is failed
- because ruby can't handling UTF-8 charactor.
- .
- This patch Add Encoding.default_external to success test.
-
-Author: Youhei SASAKI <uwabami at gfd-dennou.org>
-Bug-Debian: http://bugs.debian.org/628271
-Forwarded: https://github.com/rtomayko/tilt/pull/97
-Last-Update: 2013-07-22
-
---- ruby-tilt-1.4.1.orig/test/tilt_template_test.rb
-+++ ruby-tilt-1.4.1/test/tilt_template_test.rb
-@@ -1,3 +1,6 @@
- # coding: utf-8
-+if RUBY_VERSION >= '1.9.1'
-+    Encoding.default_external = "UTF-8"
-+end
- require 'contest'
- require 'tilt'
diff --git a/debian/patches/series b/debian/patches/series
index 711e9ab..5a08d83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-force_encoding_erb_test
+0001-Drop-bundler-dependencies.patch
+0002-Force-Encoding-ERB-Test.patch

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