[DRE-commits] [SCM] ruby-fast-gettext.git branch, master, updated. upstream/0.6.2-16-gecb45fd

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit ecb45fd016447c969c54314afddd71ebff99e06b
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Fri Dec 30 01:28:23 2011 +0300

    new upstream version 0.6.4

diff --git a/debian/changelog b/debian/changelog
index b515fa4..2a920b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-ruby-fast-gettext (0.6.2-1) unstable; urgency=low
+ruby-fast-gettext (0.6.4-1) unstable; urgency=low
 
-  * New upstream version.
-  * Patch dropped:
-    - untaint relative file path (merged upstream).
+  * New upstream version:
+    - untaint relative file path patch merged.
+  * Patches added:
+    - skip safe mode test (doesn't work under /tmp)
+    - set default external encoding in specs to utf8.
+  * Point Vcs-* control fields at git.debian.org.
 
- -- Dmitry Borodaenko <angdraug at debian.org>  Tue, 01 Nov 2011 14:40:14 +0300
+ -- Dmitry Borodaenko <angdraug at debian.org>  Sun, 08 Jan 2012 17:48:46 +0300
 
 ruby-fast-gettext (0.6.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index caf61d0..ca5641c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Dmitry Borodaenko <angdraug at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.8~), ruby-rspec, ruby-activerecord, ruby-sqlite3
 Standards-Version: 3.9.2
-Vcs-Git: git://github.com/grosser/fast_gettext.git
-Vcs-Browser: https://github.com/grosser/fast_gettext
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-fast-gettext.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-fast-gettext.git;a=summary
 Homepage: https://github.com/grosser/fast_gettext
 XS-Ruby-Versions: all
 
diff --git a/debian/patches/0001-fix-rspec-requires.patch b/debian/patches/0001-fix-rspec-requires.patch
index 0d99556..92699b7 100644
--- a/debian/patches/0001-fix-rspec-requires.patch
+++ b/debian/patches/0001-fix-rspec-requires.patch
@@ -7,10 +7,12 @@ Subject: fix rspec requires
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 8c5c45d..2e2cf3d 100644
+index aa91bb9..4f6a751 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
-@@ -1,5 +1,5 @@
+@@ -1,7 +1,7 @@
+ # $VERBOSE = true # ignore complaints in spec files
+ 
  # ---- requirements
 -require 'rubygems'
 +require 'rspec'
diff --git a/debian/patches/0002-skip-safe-mode-test.patch b/debian/patches/0002-skip-safe-mode-test.patch
new file mode 100644
index 0000000..8f234d7
--- /dev/null
+++ b/debian/patches/0002-skip-safe-mode-test.patch
@@ -0,0 +1,24 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Sun, 8 Jan 2012 16:00:44 +0300
+Subject: skip safe mode test
+
+This test produces a false negative when run under /tmp, making it
+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
+     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'
+-  end
+ end
+-- 
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
new file mode 100644
index 0000000..bef4d79
--- /dev/null
+++ b/debian/patches/0003-set-default-external-encoding-in-specs-to-utf8.patch
@@ -0,0 +1,22 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Sun, 8 Jan 2012 17:44:54 +0300
+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__))
+ require 'fast_gettext'
+ 
++Encoding.default_external='UTF-8' if RUBY_VERSION >= '1.9'
++
+ # ---- revert to defaults
+ RSpec.configure do |config|
+   config.before :all do
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 963f859..6b6f221 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-fix-rspec-requires.patch
+0002-skip-safe-mode-test.patch
+0003-set-default-external-encoding-in-specs-to-utf8.patch

-- 
ruby-fast-gettext.git