[DRE-commits] [ruby-stringex] 03/04: Drop obsolete patch: merge upstream

[Youhei SASAKI]

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

uwabami-guest pushed a commit to annotated tag debian/2.6.0-1
in repository ruby-stringex.

commit 071c99e4cfe877078254e92f7f2b195d6774e817
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Tue Jun 21 21:30:54 2016 +0900

    Drop obsolete patch: merge upstream
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/new-i18n.patch | 29 -----------------------------
 debian/patches/series         |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/new-i18n.patch b/debian/patches/new-i18n.patch
deleted file mode 100644
index 4cd5a2f..0000000
--- a/debian/patches/new-i18n.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ae20fc6fdc78d0c4c103ca1405b1b6a4c427d33f Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro at softwarelivre.org>
-Date: Fri, 31 Jul 2015 10:26:12 -0300
-Subject: [PATCH] Make tests pass against newer versions of i18n
-
-Also add safeguards so the code will still work against older versions.
-
-https://github.com/rsl/stringex/pull/175
----
- lib/stringex/localization/backend/i18n.rb | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/lib/stringex/localization/backend/i18n.rb b/lib/stringex/localization/backend/i18n.rb
-index 3518c7c..e7965f4 100644
---- a/lib/stringex/localization/backend/i18n.rb
-+++ b/lib/stringex/localization/backend/i18n.rb
-@@ -5,6 +5,12 @@ class I18n < Base
-         LOAD_PATH_BASE = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', '..', 'locales')
- 
-         class << self
-+
-+          def reset!
-+            super
-+            ::I18n.reload! if defined?(::I18n) && ::I18n.respond_to?(:reload!)
-+          end
-+
-           def locale
-             @locale || ::I18n.locale
-           end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 455712c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-new-i18n.patch

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