[DRE-commits] [ruby-gettext] 03/05: Refresh patch against new upstream version

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-gettext.

commit 5642e1f258d3bf289ae6835aca281bd7e5c79e87
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Oct 6 20:00:26 2013 -0300

    Refresh patch against new upstream version
---
 debian/changelog                                      |    2 ++
 .../0005-Restore-compatibility-with-Ruby-1.8.patch    |   17 -----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index acd7de9..5fc597f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ ruby-gettext (3.0.2-1) UNRELEASED; urgency=low
   * New upstream release.
     + contains fix for crash when LANG or LC_ALL is set to xx_YY.utf8 instead
     of xx_YY.UTF-8 (mainly gdm3 users with old user accounts). Closes: #725496
+    + debian/patches/0005-Restore-compatibility-with-Ruby-1.8.patch: refreshed
+      against new upstream version
 
  -- Antonio Terceiro <terceiro at debian.org>  Sun, 06 Oct 2013 19:51:18 -0300
 
diff --git a/debian/patches/0005-Restore-compatibility-with-Ruby-1.8.patch b/debian/patches/0005-Restore-compatibility-with-Ruby-1.8.patch
index d99f617..6dec7aa 100644
--- a/debian/patches/0005-Restore-compatibility-with-Ruby-1.8.patch
+++ b/debian/patches/0005-Restore-compatibility-with-Ruby-1.8.patch
@@ -369,23 +369,6 @@ index 2886b77..671d2c1 100644
        binary_source = source.dup.force_encoding("ASCII-8BIT")
        if /\A.*coding\s*[=:]\s*([[:alnum:]\-_]+)/ =~ binary_source
          $1.gsub(/-(?:unix|mac|dos)\z/, "")
-diff --git a/lib/gettext/tools/xgettext.rb b/lib/gettext/tools/xgettext.rb
-index e1098a5..0d36f60 100644
---- a/lib/gettext/tools/xgettext.rb
-+++ b/lib/gettext/tools/xgettext.rb
-@@ -366,7 +366,11 @@ EOH
-       end
- 
-       def encode(string)
--        string.encode(@output_encoding)
-+        if string.respond_to?(:encode)
-+          string.encode(@output_encoding)
-+        else
-+          string # don't support
-+        end
-       end
-     end
-   end
 diff --git a/test/gettext-test-utils.rb b/test/gettext-test-utils.rb
 index 4dfab44..d973c06 100644
 --- a/test/gettext-test-utils.rb

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