[DRE-commits] [ruby-fast-gettext] 02/04: update debian/ files for 1.2.0

Michael Moll mmoll-guest at moszumanska.debian.org
Tue Sep 6 00:22:39 UTC 2016 

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

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

commit 657018fd3d6515fc9d5b3f361f8b48bc39b93236
Author: Michael Moll <Michael Moll kvedulv at kvedulv.de>
Date:   Tue Sep 6 01:46:11 2016 +0200

    update debian/ files for 1.2.0
---
 debian/changelog                                         |  8 ++++++++
 debian/patches/0001-fix-rspec-requires.patch             |  2 --
 debian/patches/0002-skip-safe-mode-test.patch            |  4 +---
 debian/patches/0003-fix-tests-with-ruby-calls.patch      |  8 +-------
 ...rly-handle-PO-files-encoding-in-PoFile.to_mo_fi.patch |  6 ++----
 debian/patches/0005-remove-bogus-tests.patch             |  4 +---
 ...se-IO-each_line-instead-of-IO-lines-in-poparser.patch |  4 +---
 .../0007-Add-metadata.yml-from-upstream-gem.patch        | 16 +++++++---------
 8 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d70c94..076fe1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-fast-gettext (1.2.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+  * Refresh patches
+
+ -- Michael Moll <kvedulv at kvedulv.de>  Tue, 06 Sep 2016 01:35:24 +0200
+
 ruby-fast-gettext (1.0.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0001-fix-rspec-requires.patch b/debian/patches/0001-fix-rspec-requires.patch
index 45c23d1..6c02f9b 100644
--- a/debian/patches/0001-fix-rspec-requires.patch
+++ b/debian/patches/0001-fix-rspec-requires.patch
@@ -6,8 +6,6 @@ Subject: fix rspec requires
  spec/spec_helper.rb | 1 +
  1 file changed, 1 insertion(+)
 
-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 @@
diff --git a/debian/patches/0002-skip-safe-mode-test.patch b/debian/patches/0002-skip-safe-mode-test.patch
index eb04f50..7b20750 100644
--- a/debian/patches/0002-skip-safe-mode-test.patch
+++ b/debian/patches/0002-skip-safe-mode-test.patch
@@ -8,11 +8,9 @@ impossible to build this package with cowbuilder and the like.
  spec/fast_gettext/translation_repository/mo_spec.rb | 6 ------
  1 file changed, 6 deletions(-)
 
-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
+@@ -50,10 +50,4 @@
      rep['car'].should == 'Test'#just check it is loaded correctly
      rep.pluralisation_rule.call(2).should == 3
    end
diff --git a/debian/patches/0003-fix-tests-with-ruby-calls.patch b/debian/patches/0003-fix-tests-with-ruby-calls.patch
index f060ef9..c0e3530 100644
--- a/debian/patches/0003-fix-tests-with-ruby-calls.patch
+++ b/debian/patches/0003-fix-tests-with-ruby-calls.patch
@@ -8,8 +8,6 @@ Subject: fix tests with ruby calls
  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 @@
@@ -23,11 +21,9 @@ index 4d6b8f6..ed793d1 100644
 +    system("#{ruby} spec/cases/iconv_fallback.rb").should == true
    end
  end
-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
+@@ -85,16 +85,17 @@
  
    describe 'with i18n loaded' do
      let(:pending_condition) { (RUBY_VERSION < "1.9" and ActiveRecord::VERSION::MAJOR == 3) or (ActiveRecord::VERSION::MAJOR == 4 and ActiveRecord::VERSION::MINOR == 0)}
@@ -47,8 +43,6 @@ index 1c55ef6..3969528 100644
        end
      end
    end
-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 @@
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
index 4424f95..6c3f39d 100644
--- 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
@@ -6,16 +6,14 @@ 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
+@@ -32,7 +32,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)
+       mo_file
      end
    end
diff --git a/debian/patches/0005-remove-bogus-tests.patch b/debian/patches/0005-remove-bogus-tests.patch
index 3b40056..fd91ee5 100644
--- a/debian/patches/0005-remove-bogus-tests.patch
+++ b/debian/patches/0005-remove-bogus-tests.patch
@@ -9,11 +9,9 @@ that we can't trust.
  spec/fast_gettext/vendor/string_spec.rb | 17 -----------------
  1 file changed, 17 deletions(-)
 
-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
+@@ -82,21 +82,4 @@
        ("%{typo} xxx" % {:something=>1}).should == "%{typo} xxx"
      end
    end
diff --git a/debian/patches/0006-Use-IO-each_line-instead-of-IO-lines-in-poparser.patch b/debian/patches/0006-Use-IO-each_line-instead-of-IO-lines-in-poparser.patch
index d02f774..70456b7 100644
--- a/debian/patches/0006-Use-IO-each_line-instead-of-IO-lines-in-poparser.patch
+++ b/debian/patches/0006-Use-IO-each_line-instead-of-IO-lines-in-poparser.patch
@@ -7,11 +7,9 @@ IO#lines is deprecated and gives us a quite obnoxious deprecation warning.
  lib/fast_gettext/vendor/poparser.rb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/lib/fast_gettext/vendor/poparser.rb b/lib/fast_gettext/vendor/poparser.rb
-index 0b18880..27de150 100644
 --- a/lib/fast_gettext/vendor/poparser.rb
 +++ b/lib/fast_gettext/vendor/poparser.rb
-@@ -144,7 +144,7 @@ module GetText
+@@ -144,7 +144,7 @@
  
    def detect_file_encoding(po_file)
      open(po_file, :encoding => 'ASCII-8BIT') do |input|
diff --git a/debian/patches/0007-Add-metadata.yml-from-upstream-gem.patch b/debian/patches/0007-Add-metadata.yml-from-upstream-gem.patch
index a357ae4..5cb5b9f 100644
--- a/debian/patches/0007-Add-metadata.yml-from-upstream-gem.patch
+++ b/debian/patches/0007-Add-metadata.yml-from-upstream-gem.patch
@@ -7,23 +7,20 @@ Subject: Add metadata.yml from upstream gem
  1 file changed, 167 insertions(+)
  create mode 100644 metadata.yml
 
-diff --git a/metadata.yml b/metadata.yml
-new file mode 100644
-index 0000000..03c215f
 --- /dev/null
 +++ b/metadata.yml
-@@ -0,0 +1,167 @@
+@@ -0,0 +1,168 @@
 +--- !ruby/object:Gem::Specification
 +name: fast_gettext
 +version: !ruby/object:Gem::Version
-+  version: 0.9.2
++  version: 1.2.0
 +platform: ruby
 +authors:
 +- Michael Grosser
 +autorequire: 
 +bindir: bin
 +cert_chain: []
-+date: 2015-01-11 00:00:00.000000000 Z
++date: 2016-08-02 00:00:00.000000000 Z
 +dependencies:
 +- !ruby/object:Gem::Dependency
 +  name: rake
@@ -144,6 +141,7 @@ index 0000000..03c215f
 +- lib/fast_gettext/translation_repository/db_models/translation_key.rb
 +- lib/fast_gettext/translation_repository/db_models/translation_text.rb
 +- lib/fast_gettext/translation_repository/logger.rb
++- lib/fast_gettext/translation_repository/merge.rb
 +- lib/fast_gettext/translation_repository/mo.rb
 +- lib/fast_gettext/translation_repository/po.rb
 +- lib/fast_gettext/translation_repository/yaml.rb
@@ -154,7 +152,7 @@ index 0000000..03c215f
 +- lib/fast_gettext/vendor/poparser.rb
 +- lib/fast_gettext/vendor/string.rb
 +- lib/fast_gettext/version.rb
-+homepage: http://github.com/grosser/fast_gettext
++homepage: https://github.com/grosser/fast_gettext
 +licenses:
 +- MIT
 +- Ruby
@@ -167,7 +165,7 @@ index 0000000..03c215f
 +  requirements:
 +  - - ">="
 +    - !ruby/object:Gem::Version
-+      version: '0'
++      version: 2.1.0
 +required_rubygems_version: !ruby/object:Gem::Requirement
 +  requirements:
 +  - - ">="
@@ -175,7 +173,7 @@ index 0000000..03c215f
 +      version: '0'
 +requirements: []
 +rubyforge_project: 
-+rubygems_version: 2.2.2
++rubygems_version: 2.5.1
 +signing_key: 
 +specification_version: 4
 +summary: A simple, fast, memory-efficient and threadsafe implementation of GetText

-- 
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