[DRE-commits] [ruby-locale] 01/01: Fix patch

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository ruby-locale.

commit cbfe1260d4ccb29d8d16afebd7b1c1f008c77da9
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Thu Sep 24 17:22:50 2015 +0300

    Fix patch
---
 debian/patches/0001-Read-data-from-usr-share.patch | 30 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/debian/patches/0001-Read-data-from-usr-share.patch b/debian/patches/0001-Read-data-from-usr-share.patch
index 58c8d1d..136550c 100644
--- a/debian/patches/0001-Read-data-from-usr-share.patch
+++ b/debian/patches/0001-Read-data-from-usr-share.patch
@@ -4,9 +4,9 @@ Subject: Read data from /usr/share
 
 ---
  lib/locale.rb               | 6 ++++++
- lib/locale/info/language.rb | 2 +-
- lib/locale/info/region.rb   | 2 +-
- 3 files changed, 8 insertions(+), 2 deletions(-)
+ lib/locale/info/language.rb | 3 ++-
+ lib/locale/info/region.rb   | 3 ++-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/lib/locale.rb b/lib/locale.rb
 index d746f33..3ef3c24 100644
@@ -26,10 +26,18 @@ index d746f33..3ef3c24 100644
    # Usually, you don't need to call this directly, because
    # this is called when Locale's methods are called.
 diff --git a/lib/locale/info/language.rb b/lib/locale/info/language.rb
-index 45d25ce..c272e9e 100644
+index 45d25ce..03e7113 100644
 --- a/lib/locale/info/language.rb
 +++ b/lib/locale/info/language.rb
-@@ -90,7 +90,7 @@ module Locale
+@@ -11,6 +11,7 @@
+ =end
+ 
+ require 'zlib'
++require 'locale'
+ 
+ module Locale
+ 
+@@ -90,7 +91,7 @@ module Locale
      @@lang_two_codes = Hash.new
      @@lang_three_codes = Hash.new
  
@@ -39,10 +47,18 @@ index 45d25ce..c272e9e 100644
          l.force_encoding('UTF-8') if l.respond_to?(:force_encoding)
          unless l =~ /^\s*$/
 diff --git a/lib/locale/info/region.rb b/lib/locale/info/region.rb
-index daf1924..8a25095 100644
+index daf1924..d8e2611 100644
 --- a/lib/locale/info/region.rb
 +++ b/lib/locale/info/region.rb
-@@ -37,7 +37,7 @@ module Locale
+@@ -11,6 +11,7 @@
+ =end
+ 
+ require 'zlib'
++require 'locale'
+ 
+ module Locale
+ 
+@@ -37,7 +38,7 @@ module Locale
      end
  
      @@regions = Hash.new

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