[DRE-commits] [SCM] ruby-fast-gettext.git branch, master, updated. upstream/0.6.7-29-gb26d5ca

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit b26d5cad4120ac41292ec677d5a48b6efa7588c0
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 30 11:21:09 2012 -0300

    refresh patch

diff --git a/debian/changelog b/debian/changelog
index 6454f23..0c9913c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ruby-fast-gettext (0.6.8-1) unstable; urgency=low
   * debian/watch: changed to use gemwatch
   * Bump build dependency on gem2deb to >= 0.3.0~
   * debian/patches/0001-fix-rspec-requires.patch: refresh
+  * debian/patches/0003-set-default-external-encoding-in-specs-to-
+    utf8.patch: refreshed
 
  -- Antonio Terceiro <terceiro at debian.org>  Sat, 30 Jun 2012 11:11:44 -0300
 
diff --git a/debian/patches/0003-set-default-external-encoding-in-specs-to-utf8.patch b/debian/patches/0003-set-default-external-encoding-in-specs-to-utf8.patch
index bef4d79..4784672 100644
--- a/debian/patches/0003-set-default-external-encoding-in-specs-to-utf8.patch
+++ b/debian/patches/0003-set-default-external-encoding-in-specs-to-utf8.patch
@@ -6,17 +6,16 @@ Subject: set default external encoding in specs to utf8
  spec/spec_helper.rb |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
 
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 4f6a751..af8c889 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -5,6 +5,8 @@ require 'rspec'
- $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
+Index: ruby-fast-gettext/spec/spec_helper.rb
+===================================================================
+--- ruby-fast-gettext.orig/spec/spec_helper.rb	2012-06-30 11:20:19.000000000 -0300
++++ ruby-fast-gettext/spec/spec_helper.rb	2012-06-30 11:20:39.673833320 -0300
+@@ -4,6 +4,8 @@
+ require 'rspec'
  require 'fast_gettext'
  
 +Encoding.default_external='UTF-8' if RUBY_VERSION >= '1.9'
 +
  # ---- revert to defaults
  RSpec.configure do |config|
-   config.before :all do
--- 
+   config.before do

-- 
ruby-fast-gettext.git