[DRE-commits] [SCM] ruby-tilt.git branch, master, updated. upstream/1.3.2-4-ge7dd014

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit e7dd014b19cae82a85745f93f575fe390eed013f
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Thu Jul 28 03:51:51 2011 +0900

    Fix FTBFS: Closes: #628271
    
    Fix FTBFS: Closes: #628271
      - add Encoding.default_external for Ruby >= 1.9.1
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/changelog b/debian/changelog
index e9fe0c9..49efb62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 ruby-tilt (1.3.2-1) unstable; urgency=low
 
+  * Fix FTBFS: Closes: #628271
+    - add Encoding.default_external for Ruby >= 1.9.1
   * New Upstream version: 1.3.2
-  * Fix FTBTS: add Encoding.default_external in ruby-tests.rb (Closes: #628271)
   * Bump Standard Version: 3.9.2
   * Add manpage for /usr/bin/tilt
   * Add me to Uploaders
diff --git a/debian/patches/force_encoding_erb_test b/debian/patches/force_encoding_erb_test
new file mode 100644
index 0000000..51bc43f
--- /dev/null
+++ b/debian/patches/force_encoding_erb_test
@@ -0,0 +1,20 @@
+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: 2011-07-28
+
+--- ruby-tilt-1.3.2.orig/test/tilt_template_test.rb
++++ ruby-tilt-1.3.2/test/tilt_template_test.rb
+@@ -1,3 +1,6 @@
++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
new file mode 100644
index 0000000..711e9ab
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+force_encoding_erb_test
diff --git a/debian/ruby-tests.rb b/debian/ruby-tests.rb
index 8cffe7b..03b1487 100644
--- a/debian/ruby-tests.rb
+++ b/debian/ruby-tests.rb
@@ -1,5 +1,2 @@
-if RUBY_VERSION >= '1.9.1'
-  Encoding.default_external = "UTF-8"
-end
 $: << 'lib' << 'test' << '.'
 Dir['test/**/*.rb'].each { |f| require f }
diff --git a/test/tilt_template_test.rb b/test/tilt_template_test.rb
index a16b969..09a8bbf 100644
--- a/test/tilt_template_test.rb
+++ b/test/tilt_template_test.rb
@@ -1,3 +1,6 @@
+if RUBY_VERSION >= '1.9.1'
+    Encoding.default_external = "UTF-8"
+end
 require 'contest'
 require 'tilt'
 

-- 
ruby-tilt.git