[DRE-commits] [ruby-fast-gettext] 04/04: rebased patch series to 0.9.0
Dmitry Borodaenko
angdraug at moszumanska.debian.org
Sat Oct 18 20:00:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
angdraug pushed a commit to branch master
in repository ruby-fast-gettext.
commit 20ee9882ec66797827e6bbaae9a4070e3f331502
Author: Dmitry Borodaenko <angdraug at gmail.com>
Date: Sat Oct 18 12:56:35 2014 -0700
rebased patch series to 0.9.0
---
debian/patches/0001-fix-rspec-requires.patch | 17 +++++----
debian/patches/0002-skip-safe-mode-test.patch | 14 ++++----
....patch => 0003-fix-tests-with-ruby-calls.patch} | 40 +++++++++++++---------
...ndle-PO-files-encoding-in-PoFile.to_mo_fi.patch | 21 ++++++++++++
.../0005-fix-encoding-handling-in-pofile.patch | 19 ----------
...s-tests.patch => 0005-remove-bogus-tests.patch} | 19 +++++-----
debian/patches/series | 6 ++--
7 files changed, 73 insertions(+), 63 deletions(-)
diff --git a/debian/patches/0001-fix-rspec-requires.patch b/debian/patches/0001-fix-rspec-requires.patch
index 25824a8..45c23d1 100644
--- a/debian/patches/0001-fix-rspec-requires.patch
+++ b/debian/patches/0001-fix-rspec-requires.patch
@@ -3,19 +3,18 @@ Date: Sun, 18 Sep 2011 13:24:18 +0300
Subject: fix rspec requires
---
- spec/spec_helper.rb | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ spec/spec_helper.rb | 1 +
+ 1 file changed, 1 insertion(+)
-Index: ruby-fast-gettext/spec/spec_helper.rb
-===================================================================
---- ruby-fast-gettext.orig/spec/spec_helper.rb 2012-06-30 11:17:45.000000000 -0300
-+++ ruby-fast-gettext/spec/spec_helper.rb 2012-06-30 11:19:03.221837111 -0300
-@@ -1,7 +1,7 @@
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 23b4387..f2cc4a5 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -1,6 +1,7 @@
# $VERBOSE = true # ignore complaints in spec files
# ---- requirements
--$LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
+require 'rspec'
require 'fast_gettext'
+ require 'active_record'
- # ---- revert to defaults
diff --git a/debian/patches/0002-skip-safe-mode-test.patch b/debian/patches/0002-skip-safe-mode-test.patch
index 2fc249d..eb04f50 100644
--- a/debian/patches/0002-skip-safe-mode-test.patch
+++ b/debian/patches/0002-skip-safe-mode-test.patch
@@ -5,14 +5,14 @@ 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(-)
+ spec/fast_gettext/translation_repository/mo_spec.rb | 6 ------
+ 1 file changed, 6 deletions(-)
-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 @@
+diff --git a/spec/fast_gettext/translation_repository/mo_spec.rb b/spec/fast_gettext/translation_repository/mo_spec.rb
+index baca690..85135db 100644
+--- a/spec/fast_gettext/translation_repository/mo_spec.rb
++++ b/spec/fast_gettext/translation_repository/mo_spec.rb
+@@ -49,10 +49,4 @@ describe 'FastGettext::TranslationRepository::Mo' do
rep['car'].should == 'Test'#just check it is loaded correctly
rep.pluralisation_rule.call(2).should == 3
end
diff --git a/debian/patches/0004-fix-tests-with-ruby-calls.patch b/debian/patches/0003-fix-tests-with-ruby-calls.patch
similarity index 60%
rename from debian/patches/0004-fix-tests-with-ruby-calls.patch
rename to debian/patches/0003-fix-tests-with-ruby-calls.patch
index be430bb..f060ef9 100644
--- a/debian/patches/0004-fix-tests-with-ruby-calls.patch
+++ b/debian/patches/0003-fix-tests-with-ruby-calls.patch
@@ -1,11 +1,17 @@
From: Antonio Terceiro <terceiro at debian.org>
-Date: Sat Jun 30 13:28:02 2012 -0300
+Date: Sat, 30 Jun 2012 13:28:02 -0300
Subject: fix tests with ruby calls
-Index: git/spec/fast_gettext/vendor/iconv_spec.rb
-===================================================================
---- git.orig/spec/fast_gettext/vendor/iconv_spec.rb 2014-05-05 18:28:21.838222621 +0200
-+++ git/spec/fast_gettext/vendor/iconv_spec.rb 2014-05-05 18:30:53.878720808 +0200
+---
+ spec/fast_gettext/vendor/iconv_spec.rb | 4 +++-
+ spec/fast_gettext/vendor/string_spec.rb | 5 +++--
+ spec/spec_helper.rb | 1 +
+ 3 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/spec/fast_gettext/vendor/iconv_spec.rb b/spec/fast_gettext/vendor/iconv_spec.rb
+index 4d6b8f6..ed793d1 100644
+--- a/spec/fast_gettext/vendor/iconv_spec.rb
++++ b/spec/fast_gettext/vendor/iconv_spec.rb
@@ -1,7 +1,9 @@
require "spec_helper"
@@ -17,14 +23,14 @@ Index: git/spec/fast_gettext/vendor/iconv_spec.rb
+ system("#{ruby} spec/cases/iconv_fallback.rb").should == true
end
end
-Index: git/spec/fast_gettext/vendor/string_spec.rb
-===================================================================
---- git.orig/spec/fast_gettext/vendor/string_spec.rb 2014-05-05 18:28:21.838222621 +0200
-+++ git/spec/fast_gettext/vendor/string_spec.rb 2014-05-05 18:30:53.878720808 +0200
-@@ -85,16 +85,17 @@
+diff --git a/spec/fast_gettext/vendor/string_spec.rb b/spec/fast_gettext/vendor/string_spec.rb
+index 1c55ef6..3969528 100644
+--- a/spec/fast_gettext/vendor/string_spec.rb
++++ b/spec/fast_gettext/vendor/string_spec.rb
+@@ -85,16 +85,17 @@ describe String do
describe 'with i18n loaded' do
- let(:pending_condition) { (RUBY_VERSION < "1.9" and ActiveRecord::VERSION::MAJOR == 3) or ActiveRecord::VERSION::MAJOR >= 4 }
+ let(:pending_condition) { (RUBY_VERSION < "1.9" and ActiveRecord::VERSION::MAJOR == 3) or (ActiveRecord::VERSION::MAJOR == 4 and ActiveRecord::VERSION::MINOR == 0)}
+ let(:ruby) { File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) }
it "interpolates if i18n is loaded before" do
@@ -41,14 +47,14 @@ Index: git/spec/fast_gettext/vendor/string_spec.rb
end
end
end
-Index: git/spec/spec_helper.rb
-===================================================================
---- git.orig/spec/spec_helper.rb 2014-05-05 18:30:53.802718559 +0200
-+++ git/spec/spec_helper.rb 2014-05-05 18:30:53.882720925 +0200
-@@ -3,6 +3,7 @@
- # ---- requirements
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index f2cc4a5..1052b1d 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -4,6 +4,7 @@
require 'rspec'
require 'fast_gettext'
+ require 'active_record'
+require 'rbconfig'
# ---- revert to defaults
diff --git a/debian/patches/0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch b/debian/patches/0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch
new file mode 100644
index 0000000..4424f95
--- /dev/null
+++ b/debian/patches/0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
+Date: Mon, 5 May 2014 18:43:48 +0200
+Subject: Properly handle PO files encoding in PoFile.to_mo_file
+
+---
+ lib/fast_gettext/po_file.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/fast_gettext/po_file.rb b/lib/fast_gettext/po_file.rb
+index 9f3d7cc..6996a61 100644
+--- a/lib/fast_gettext/po_file.rb
++++ b/lib/fast_gettext/po_file.rb
+@@ -12,7 +12,7 @@ module FastGettext
+ parser.report_warning = options.fetch(:report_warning, true)
+
+ mo_file = FastGettext::GetText::MOFile.new
+- parser.parse(File.read(file), mo_file)
++ parser.parse_file(file, mo_file)
+ MoFile.new(mo_file)
+ end
+ end
diff --git a/debian/patches/0005-fix-encoding-handling-in-pofile.patch b/debian/patches/0005-fix-encoding-handling-in-pofile.patch
deleted file mode 100644
index 64d5bae..0000000
--- a/debian/patches/0005-fix-encoding-handling-in-pofile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Properly handle PO files encoding in PoFile.to_mo_file
-Author: Jérémy Bobbio <lunar at debian.org>
-Last-Updated: 2014-05-05
-Bug: https://github.com/grosser/fast_gettext/issues/32
-Bug-Debian: http://bugs.debian.org/718218
-
-Index: git/lib/fast_gettext/po_file.rb
-===================================================================
---- git.orig/lib/fast_gettext/po_file.rb 2014-05-05 17:59:51.115480487 +0200
-+++ git/lib/fast_gettext/po_file.rb 2014-05-05 18:43:48.657826012 +0200
-@@ -12,7 +12,7 @@
- parser.report_warning = options.fetch(:report_warning, true)
-
- mo_file = FastGettext::GetText::MOFile.new
-- parser.parse(File.read(file), mo_file)
-+ parser.parse_file(file, mo_file)
- MoFile.new(mo_file)
- end
- end
diff --git a/debian/patches/0006-remove-bogus-tests.patch b/debian/patches/0005-remove-bogus-tests.patch
similarity index 64%
rename from debian/patches/0006-remove-bogus-tests.patch
rename to debian/patches/0005-remove-bogus-tests.patch
index 9dd5c1b..3b40056 100644
--- a/debian/patches/0006-remove-bogus-tests.patch
+++ b/debian/patches/0005-remove-bogus-tests.patch
@@ -1,22 +1,25 @@
-From: Jérémy Bobbio <lunar at debian.org>
-Date: 2014-09-03
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
+Date: Wed, 3 Sep 2014 01:51:33 +0000
Subject: remove bogus tests
These tests should not be passing. Yet they do. Something is
wrong and it's unclear what to do. So let's remove the tests
that we can't trust.
+---
+ spec/fast_gettext/vendor/string_spec.rb | 17 -----------------
+ 1 file changed, 17 deletions(-)
-Index: git/spec/fast_gettext/vendor/string_spec.rb
-===================================================================
---- git.orig/spec/fast_gettext/vendor/string_spec.rb 2014-09-03 01:51:08.929926805 +0000
-+++ git/spec/fast_gettext/vendor/string_spec.rb 2014-09-03 01:51:33.702049643 +0000
-@@ -82,21 +82,4 @@
+diff --git a/spec/fast_gettext/vendor/string_spec.rb b/spec/fast_gettext/vendor/string_spec.rb
+index 3969528..d1a6da6 100644
+--- a/spec/fast_gettext/vendor/string_spec.rb
++++ b/spec/fast_gettext/vendor/string_spec.rb
+@@ -82,21 +82,4 @@ describe String do
("%{typo} xxx" % {:something=>1}).should == "%{typo} xxx"
end
end
-
- describe 'with i18n loaded' do
-- let(:pending_condition) { (RUBY_VERSION < "1.9" and ActiveRecord::VERSION::MAJOR == 3) or ActiveRecord::VERSION::MAJOR >= 4 }
+- let(:pending_condition) { (RUBY_VERSION < "1.9" and ActiveRecord::VERSION::MAJOR == 3) or (ActiveRecord::VERSION::MAJOR == 4 and ActiveRecord::VERSION::MINOR == 0)}
- let(:ruby) { File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']) }
-
- it "interpolates if i18n is loaded before" do
diff --git a/debian/patches/series b/debian/patches/series
index 2497142..2f90d94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
0001-fix-rspec-requires.patch
0002-skip-safe-mode-test.patch
-0004-fix-tests-with-ruby-calls.patch
-0005-fix-encoding-handling-in-pofile.patch
-0006-remove-bogus-tests.patch
+0003-fix-tests-with-ruby-calls.patch
+0004-Properly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch
+0005-remove-bogus-tests.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-fast-gettext.git
More information about the Pkg-ruby-extras-commits
mailing list