[DRE-commits] [SCM] ruby-locale.git branch, master, updated. debian/2.0.5-5-19-g762161f

[Hleb Valoshka]

The following commit has been merged in the master branch:
commit 762161f2fa78089350d5cd7664f6d8bbd64d3876
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sun Mar 31 18:50:08 2013 +0300

    more correct patch for ctype

diff --git a/debian/patches/0002-use-proper-envvar-LC_CTYPE.patch b/debian/patches/0002-use-proper-envvar-LC_CTYPE.patch
index d72a27c..39cdc2e 100644
--- a/debian/patches/0002-use-proper-envvar-LC_CTYPE.patch
+++ b/debian/patches/0002-use-proper-envvar-LC_CTYPE.patch
@@ -1,12 +1,14 @@
 From: Hleb Valoshka <375GNU at Gmail.COM>
-Date: Sun, 31 Mar 2013 18:40:16 +0300
+Date: Sun, 31 Mar 2013 18:45:43 +0300
 Subject: use proper envvar LC_CTYPE
 
 ---
- doc/text/news.md           | 2 +-
- lib/locale/driver/env.rb   | 6 +++---
- lib/locale/driver/posix.rb | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
+ doc/text/news.md            |  2 +-
+ lib/locale/driver/env.rb    |  6 +++---
+ lib/locale/driver/posix.rb  |  2 +-
+ test/test_detect_general.rb | 10 +++++-----
+ test/test_driver_jruby.rb   |  2 +-
+ 5 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/doc/text/news.md b/doc/text/news.md
 index 263f7a6..0b15066 100644
@@ -61,3 +63,64 @@ index 16d8efd..eaf03e4 100644
        # Only LANGUAGE accept plural languages such as "nl_BE;
        # * Returns: an Array of the locale as Locale::Tag::Posix or nil.
        def locales
+diff --git a/test/test_detect_general.rb b/test/test_detect_general.rb
+index ca0af22..6d47192 100644
+--- a/test/test_detect_general.rb
++++ b/test/test_detect_general.rb
+@@ -28,14 +28,14 @@ class TestDetectGeneral < Test::Unit::TestCase
+     Locale.init
+     Locale.clear_all
+     ENV["LC_ALL"] = nil
+-    ENV["LC_CTYPES"] = nil
++    ENV["LC_CTYPE"] = nil
+     ENV["LANG"] = nil
+     ENV["LANGUAGE"] = nil
+   end
+ 
+   def test_lc_all
+     ENV["LC_ALL"] = "ja_JP.eucJP"
+-    ENV["LC_CTYPES"] = "zh_CN.UTF-8"  #Ignored.
++    ENV["LC_CTYPE"] = "zh_CN.UTF-8"  #Ignored.
+     ENV["LANG"] = "ko_KR.UTF-8"  #Ignored.
+     ENV["LANGUAGE"] = nil
+ 
+@@ -51,7 +51,7 @@ class TestDetectGeneral < Test::Unit::TestCase
+ 
+   def test_lc_messages
+     ENV["LC_ALL"] = nil
+-    ENV["LC_CTYPES"] = "ja_JP.eucJP"
++    ENV["LC_CTYPE"] = "ja_JP.eucJP"
+     ENV["LANG"] = "ko_KR.UTF-8"  #Ignored.
+     ENV["LANGUAGE"] = nil
+ 
+@@ -67,7 +67,7 @@ class TestDetectGeneral < Test::Unit::TestCase
+ 
+   def test_lang
+     ENV["LC_ALL"] = nil
+-    ENV["LC_CTYPES"] = nil
++    ENV["LC_CTYPE"] = nil
+     ENV["LANG"] = "ja_JP.eucJP"
+     ENV["LANGUAGE"] = nil
+ 
+@@ -83,7 +83,7 @@ class TestDetectGeneral < Test::Unit::TestCase
+ 
+   def test_lang_complex
+     ENV["LC_ALL"] = "zh_CN.UTF-8"  # Ignored.
+-    ENV["LC_CTYPES"] = "ko_KR.UTF-8" #Ingored.
++    ENV["LC_CTYPE"] = "ko_KR.UTF-8" #Ingored.
+     ENV["LANG"] = "en_US.UTF-8"  # Ignored.
+     ENV["LANGUAGE"] ="ja_JP.eucJP:zh_CN.UTF-8"
+ 
+diff --git a/test/test_driver_jruby.rb b/test/test_driver_jruby.rb
+index 27e8e14..3eb7b84 100644
+--- a/test/test_driver_jruby.rb
++++ b/test/test_driver_jruby.rb
+@@ -26,7 +26,7 @@ begin
+ 
+     def setup
+       ENV["LC_ALL"] = nil
+-      ENV["LC_CTYPES"] = nil
++      ENV["LC_CTYPE"] = nil
+       ENV["LANG"] = nil
+       ENV["LANGUAGE"] = nil
+     end

-- 
ruby-locale.git