[DRE-commits] [SCM] coderay.git branch, master, updated. debian/0.9.8-1-8-g9ded0b9

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 9ded0b98be7ff1c9232740d12fef9e8c84e9ef65
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Feb 28 20:46:32 2012 +0900

    New patch 0003-Add-Encoding.default_external.patch
    
    Add Encoding.default_external = "UTF-8" due to sbuild/pbuilder locale
    settings.
    
    This patch might be Debian specific.
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/patches/0001-Remove-rubygems-depends.patch b/debian/patches/0001-Remove-rubygems-depends.patch
index f936324..94e6b89 100644
--- a/debian/patches/0001-Remove-rubygems-depends.patch
+++ b/debian/patches/0001-Remove-rubygems-depends.patch
@@ -8,9 +8,11 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  lib/coderay/for_redcloth.rb  |   13 +------------
  2 files changed, 3 insertions(+), 21 deletions(-)
 
---- coderay.orig/lib/coderay/encoders/json.rb
-+++ coderay/lib/coderay/encoders/json.rb
-@@ -20,15 +20,8 @@
+diff --git a/lib/coderay/encoders/json.rb b/lib/coderay/encoders/json.rb
+index a9e40dc..51a8539 100644
+--- a/lib/coderay/encoders/json.rb
++++ b/lib/coderay/encoders/json.rb
+@@ -20,15 +20,8 @@ module Encoders
      begin
        require 'json'
      rescue LoadError
@@ -28,9 +30,11 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
      end
      
      register_for :json
---- coderay.orig/lib/coderay/for_redcloth.rb
-+++ coderay/lib/coderay/for_redcloth.rb
-@@ -13,18 +13,7 @@
+diff --git a/lib/coderay/for_redcloth.rb b/lib/coderay/for_redcloth.rb
+index f9df32b..88ef585 100644
+--- a/lib/coderay/for_redcloth.rb
++++ b/lib/coderay/for_redcloth.rb
+@@ -13,18 +13,7 @@ module CodeRay
    module ForRedCloth
      
      def self.install
@@ -49,7 +53,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
        unless RedCloth::VERSION.to_s >= '4.2.2'
          warn 'CodeRay.for_redcloth works best with RedCloth version 4.2.2 or later.'
        end
-@@ -92,4 +81,4 @@
+@@ -92,4 +81,4 @@ module CodeRay
    
  end
  
diff --git a/debian/patches/0002-Add-lack-file-for-UnitTest.patch b/debian/patches/0002-Add-lack-file-for-UnitTest.patch
index 902e36b..5e064e1 100644
--- a/debian/patches/0002-Add-lack-file-for-UnitTest.patch
+++ b/debian/patches/0002-Add-lack-file-for-UnitTest.patch
@@ -8,8 +8,11 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  1 files changed, 15 insertions(+), 0 deletions(-)
  create mode 100644 test/lib/assert_warning.rb
 
+diff --git a/test/lib/assert_warning.rb b/test/lib/assert_warning.rb
+new file mode 100644
+index 0000000..828b464
 --- /dev/null
-+++ coderay/test/lib/assert_warning.rb
++++ b/test/lib/assert_warning.rb
 @@ -0,0 +1,15 @@
 +class Test::Unit::TestCase
 +  
diff --git a/debian/patches/0003-Add-Encoding.default_external.patch b/debian/patches/0003-Add-Encoding.default_external.patch
new file mode 100644
index 0000000..d5f88e4
--- /dev/null
+++ b/debian/patches/0003-Add-Encoding.default_external.patch
@@ -0,0 +1,22 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Tue, 28 Feb 2012 20:44:20 +0900
+Subject: Add Encoding.default_external
+
+Add Encoding.default_external = "UTF-8" due to sbuild/pbuilder locale
+settings. This might be Debian specific.
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ test/functional/basic.rb |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/test/functional/basic.rb b/test/functional/basic.rb
+index 3053b54..37d52f0 100755
+--- a/test/functional/basic.rb
++++ b/test/functional/basic.rb
+@@ -1,4 +1,5 @@
+ # encoding: utf-8
++Encoding.default_external = "UTF-8" if defined? Encoding
+ require 'test/unit'
+ require File.expand_path('../../lib/assert_warning', __FILE__)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3b00d88..7d4702b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Remove-rubygems-depends.patch
 0002-Add-lack-file-for-UnitTest.patch
+0003-Add-Encoding.default_external.patch

-- 
coderay.git