[DRE-commits] [ruby-i18n] 06/06: refresh patches

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-i18n.

commit 435294f414800dfcf2c39cc0388c2dc9831d43e0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jul 28 22:28:50 2015 +0530

    refresh patches
---
 debian/changelog                   |  3 ++-
 debian/patches/i18n_set.patch      | 22 ----------------------
 debian/patches/series              |  1 -
 debian/patches/strip_bundler.patch | 28 +++++++++++++++-------------
 4 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2d5afe..9329ff3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ ruby-i18n (0.7.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
-  * Refresh patch revert-available-locales-cache.patch.
+  * Refresh patches.
+  * Remove patch i18n_set.patch (already applied).
 
  -- Pirate Praveen <praveen at debian.org>  Tue, 28 Jul 2015 22:06:48 +0530
 
diff --git a/debian/patches/i18n_set.patch b/debian/patches/i18n_set.patch
deleted file mode 100644
index 35f23b6..0000000
--- a/debian/patches/i18n_set.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Carlos Antonio da Silva <carlosantoniodasilva at gmail.com>
-Description: [PATCH] Require missing set file. Closes #270
-Origin: https://github.com/svenfuchs/i18n/commit/05428e594281305bf24f3e68122ef38ab64a0294
-
-
----
- lib/i18n/config.rb | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/i18n/config.rb b/lib/i18n/config.rb
-index f0bb45b..d39b199 100644
---- a/lib/i18n/config.rb
-+++ b/lib/i18n/config.rb
-@@ -1,3 +1,5 @@
-+require 'set'
-+
- module I18n
-   class Config
-     # The only configuration value that is not global and scoped to thread is :locale.
--- 
-2.0.3
-
diff --git a/debian/patches/series b/debian/patches/series
index 7fa6aab..0f5f97a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 revert-available-locales-cache.patch
 strip_bundler.patch
-i18n_set.patch
diff --git a/debian/patches/strip_bundler.patch b/debian/patches/strip_bundler.patch
index 191cbff..a20f928 100644
--- a/debian/patches/strip_bundler.patch
+++ b/debian/patches/strip_bundler.patch
@@ -3,10 +3,10 @@ Description: disable bundler on build time, do not install dependency on build
              time via bundler
 Forwarded: not-needed
 
-diff --git a/test/run_all.rb b/test/run_all.rb
-index 46bc43c..965b345 100644
---- a/test/run_all.rb
-+++ b/test/run_all.rb
+Index: ruby-i18n/test/run_all.rb
+===================================================================
+--- ruby-i18n.orig/test/run_all.rb
++++ ruby-i18n/test/run_all.rb
 @@ -1,6 +1,3 @@
 -def bundle_check
 -  `bundle check` == "Resolving dependencies...\nThe Gemfile's dependencies are satisfied\n"
@@ -14,21 +14,23 @@ index 46bc43c..965b345 100644
  
  def execute(command)
    puts command
-@@ -13,8 +10,6 @@ results = gemfiles.map do |gemfile|
+@@ -12,9 +9,7 @@ gemfiles = %w(Gemfile) + Dir['gemfiles/G
+ results = gemfiles.map do |gemfile|
    puts "\nBUNDLE_GEMFILE=#{gemfile}"
    ENV['BUNDLE_GEMFILE'] = File.expand_path("../../#{gemfile}", __FILE__)
- 
+-
 -  execute 'bundle install' unless bundle_check
--  execute 'bundle exec ruby -w -Ilib -Itest test/all.rb'
+-  execute 'bundle exec rake test'
++  execute rake test
  end
  
  exit results.all?
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index d24b81f..0c83fcc 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -30,7 +30,6 @@ def gem(gem_name, *version_requirements)
-   gem_name =='i18n' ? puts("skipping loading the i18n gem ...") : super
+Index: ruby-i18n/test/test_helper.rb
+===================================================================
+--- ruby-i18n.orig/test/test_helper.rb
++++ ruby-i18n/test/test_helper.rb
+@@ -13,7 +13,6 @@ class TEST_CASE
+   end
  end
  
 -require 'bundler/setup'

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