[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 1e864084333dfc0cd5a84b5ad32ead620cdbb0d6
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sun Mar 31 18:41:44 2013 +0300

    add patch for ctype

diff --git a/debian/patches/0001-fix-bugs-with-charset-handling.patch b/debian/patches/0001-fix-bugs-with-charset-handling.patch
index 3a906bd..7a5465a 100644
--- a/debian/patches/0001-fix-bugs-with-charset-handling.patch
+++ b/debian/patches/0001-fix-bugs-with-charset-handling.patch
@@ -1,5 +1,5 @@
 From: Hleb Valoshka <375GNU at Gmail.COM>
-Date: Sun, 31 Mar 2013 17:59:39 +0300
+Date: Sun, 31 Mar 2013 18:37:58 +0300
 Subject: fix bugs with charset handling
 
    Fixes #520181
diff --git a/debian/patches/0002-use-proper-envvar-LC_CTYPE.patch b/debian/patches/0002-use-proper-envvar-LC_CTYPE.patch
new file mode 100644
index 0000000..d72a27c
--- /dev/null
+++ b/debian/patches/0002-use-proper-envvar-LC_CTYPE.patch
@@ -0,0 +1,63 @@
+From: Hleb Valoshka <375GNU at Gmail.COM>
+Date: Sun, 31 Mar 2013 18:40:16 +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(-)
+
+diff --git a/doc/text/news.md b/doc/text/news.md
+index 263f7a6..0b15066 100644
+--- a/doc/text/news.md
++++ b/doc/text/news.md
+@@ -45,7 +45,7 @@ Ruby 1.9 on Windows support release.
+     Windows platform. [Patch by J. Pablo Fernández]
+   * [jruby] Fixed wrong variant format.
+     [GitHub#mutoh/locale#5] [Patch by Hleb Valoshka]
+-  * Fixed wrong environment variable check. `LC_CTYPES` is checked
++  * Fixed wrong environment variable check. `LC_CTYPE` is checked
+     instead of `LC_MESSAGES`.
+     [GitHub#mutoh/locale#5] [Debian#520181]
+     [Reported by Adeodato Simó] [Patch by Hleb Valoshka]
+diff --git a/lib/locale/driver/env.rb b/lib/locale/driver/env.rb
+index b4e96c6..a023383 100644
+--- a/lib/locale/driver/env.rb
++++ b/lib/locale/driver/env.rb
+@@ -34,11 +34,11 @@ module Locale
+     module Env
+       module_function
+ 
+-      # Gets the locale from environment variable. (LC_ALL > LC_CTYPES > LANG)
++      # Gets the locale from environment variable. (LC_ALL > LC_CTYPE > LANG)
+       # Returns: the locale as Locale::Tag::Posix.
+       def locale
+         # At least one environment valiables should be set on *nix system.
+-        [ENV["LC_ALL"], ENV["LC_CTYPES"], ENV["LANG"]].each do |loc|
++        [ENV["LC_ALL"], ENV["LC_CTYPE"], ENV["LANG"]].each do |loc|
+           if loc != nil and loc.size > 0
+             return Locale::Tag::Posix.parse(loc)
+           end
+@@ -46,7 +46,7 @@ module Locale
+         nil
+       end
+ 
+-      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_CTYPES > LANG)
++      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_CTYPE > LANG)
+       # * Returns: an Array of the locale as Locale::Tag::Posix or nil.
+       def locales
+         locales = ENV["LANGUAGE"]
+diff --git a/lib/locale/driver/posix.rb b/lib/locale/driver/posix.rb
+index 16d8efd..eaf03e4 100644
+--- a/lib/locale/driver/posix.rb
++++ b/lib/locale/driver/posix.rb
+@@ -30,7 +30,7 @@ module Locale
+       $stderr.puts self.name + " is loaded." if $DEBUG
+ 
+       module_function
+-      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_CTYPES > LANG)
++      # Gets the locales from environment variables. (LANGUAGE > LC_ALL > LC_CTYPE > LANG)
+       # 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/debian/patches/series b/debian/patches/series
index 69e1410..618886a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-fix-bugs-with-charset-handling.patch
+0002-use-proper-envvar-LC_CTYPE.patch

-- 
ruby-locale.git