[DRE-commits] [ruby-fast-gettext] 03/08: Refresh patches

[Jérémy Bobbio]

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

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

commit 7f650fdc6545fb3a592d2ce21426d7d382de73ad
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Mon May 5 18:19:21 2014 +0200

    Refresh patches
---
 debian/patches/0002-skip-safe-mode-test.patch      | 15 ++++++------
 .../patches/0004-fix-tests-with-ruby-calls.patch   | 28 ++++++++++------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/debian/patches/0002-skip-safe-mode-test.patch b/debian/patches/0002-skip-safe-mode-test.patch
index 8f234d7..2fc249d 100644
--- a/debian/patches/0002-skip-safe-mode-test.patch
+++ b/debian/patches/0002-skip-safe-mode-test.patch
@@ -8,17 +8,18 @@ impossible to build this package with cowbuilder and the like.
  .../fast_gettext/translation_repository/mo_spec.rb |    4 ----
  1 files changed, 0 insertions(+), 4 deletions(-)
 
-diff --git a/spec/fast_gettext/translation_repository/mo_spec.rb b/spec/fast_gettext/translation_repository/mo_spec.rb
-index 8690b90..291849c 100644
---- a/spec/fast_gettext/translation_repository/mo_spec.rb
-+++ b/spec/fast_gettext/translation_repository/mo_spec.rb
-@@ -26,8 +26,4 @@ describe 'FastGettext::TranslationRepository::Mo' do
+Index: git/spec/fast_gettext/translation_repository/mo_spec.rb
+===================================================================
+--- git.orig/spec/fast_gettext/translation_repository/mo_spec.rb	2014-05-05 18:14:54.000000000 +0200
++++ git/spec/fast_gettext/translation_repository/mo_spec.rb	2014-05-05 18:15:40.935676768 +0200
+@@ -49,10 +49,4 @@
      rep['car'].should == 'Test'#just check it is loaded correctly
      rep.pluralisation_rule.call(2).should == 3
    end
 -
 -  it "can work in SAFE mode" do
--    `ruby spec/cases/safe_mode_can_handle_locales.rb 2>&1`.should == 'true'
+-    pending_if RUBY_VERSION > "2.0" do
+-      `ruby spec/cases/safe_mode_can_handle_locales.rb 2>&1`.should == 'true'
+-    end
 -  end
  end
--- 
diff --git a/debian/patches/0004-fix-tests-with-ruby-calls.patch b/debian/patches/0004-fix-tests-with-ruby-calls.patch
index b7b5827..856a74c 100644
--- a/debian/patches/0004-fix-tests-with-ruby-calls.patch
+++ b/debian/patches/0004-fix-tests-with-ruby-calls.patch
@@ -2,10 +2,10 @@ From: Antonio Terceiro <terceiro at debian.org>
 Date: Sat Jun 30 13:28:02 2012 -0300
 Subject: fix tests with ruby calls
 
-Index: ruby-fast-gettext/spec/fast_gettext/vendor/iconv_spec.rb
+Index: git/spec/fast_gettext/vendor/iconv_spec.rb
 ===================================================================
---- ruby-fast-gettext.orig/spec/fast_gettext/vendor/iconv_spec.rb	2012-06-30 12:58:24.119084699 -0300
-+++ ruby-fast-gettext/spec/fast_gettext/vendor/iconv_spec.rb	2012-06-30 13:24:18.210727451 -0300
+--- git.orig/spec/fast_gettext/vendor/iconv_spec.rb	2014-05-05 17:59:51.000000000 +0200
++++ git/spec/fast_gettext/vendor/iconv_spec.rb	2014-05-05 18:16:42.345498635 +0200
 @@ -2,6 +2,6 @@
  
  describe 'Iconv' do
@@ -14,25 +14,23 @@ Index: ruby-fast-gettext/spec/fast_gettext/vendor/iconv_spec.rb
 +    system("ruby spec/cases/iconv_fallback.rb").should == true
    end
  end
-Index: ruby-fast-gettext/spec/fast_gettext/vendor/string_spec.rb
+Index: git/spec/fast_gettext/vendor/string_spec.rb
 ===================================================================
---- ruby-fast-gettext.orig/spec/fast_gettext/vendor/string_spec.rb	2012-06-30 12:58:24.119084699 -0300
-+++ ruby-fast-gettext/spec/fast_gettext/vendor/string_spec.rb	2012-06-30 13:27:24.532249520 -0300
-@@ -95,15 +95,11 @@
+--- git.orig/spec/fast_gettext/vendor/string_spec.rb	2014-05-05 17:59:51.000000000 +0200
++++ git/spec/fast_gettext/vendor/string_spec.rb	2014-05-05 18:18:31.276729312 +0200
+@@ -88,13 +88,13 @@
  
-   describe 'with i18n loaded' do
      it "interpolates if i18n is loaded before" do
--      pending_18 do
+       pending_if pending_condition, "does not work on ree + rails 3 or rails 4"  do
 -        system("bundle exec ruby spec/cases/interpolate_i18n_before_fast_gettext.rb  > /dev/null 2>&1").should == true
--      end
-+      system("ruby spec/cases/interpolate_i18n_before_fast_gettext.rb  > /dev/null 2>&1").should == true
++        system("ruby spec/cases/interpolate_i18n_before_fast_gettext.rb  > /dev/null 2>&1").should == true
+       end
      end
  
      it "interpolates if i18n is loaded before" do
--      pending_18 do
+       pending_if pending_condition, "does not work on ree + rails 3 or rails 4"  do
 -        system("bundle exec ruby spec/cases/interpolate_i18n_after_fast_gettext.rb > /dev/null 2>&1").should == true
--      end
-+      system("ruby spec/cases/interpolate_i18n_after_fast_gettext.rb > /dev/null 2>&1").should == true
++        system("ruby spec/cases/interpolate_i18n_after_fast_gettext.rb > /dev/null 2>&1").should == true
+       end
      end
    end
- end

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