[DRE-commits] [ruby-json] 04/05: Drop 0005-Disable-rubygems-usage-in-tests-helper.patch, not needed anymore. Refresh 0003-Remove-additional-gemspec-files.patch and 04-fix-tests-path.patch

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-json.

commit fb93d13240dcf47c552f8a673ba151900c1028fc
Author: Cédric Boutillier <boutil at debian.org>
Date:   Fri Jul 7 00:34:31 2017 +0200

    Drop 0005-Disable-rubygems-usage-in-tests-helper.patch, not needed anymore. Refresh 0003-Remove-additional-gemspec-files.patch and 04-fix-tests-path.patch
---
 debian/patches/0003-Remove-additional-gemspec-files.patch  | 14 ++++++--------
 .../0005-Disable-rubygems-usage-in-tests-helper.patch      | 13 -------------
 debian/patches/04-fix-tests-path.patch                     |  5 +++--
 debian/patches/series                                      |  1 -
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/debian/patches/0003-Remove-additional-gemspec-files.patch b/debian/patches/0003-Remove-additional-gemspec-files.patch
index 3d8f948..0ea2f39 100644
--- a/debian/patches/0003-Remove-additional-gemspec-files.patch
+++ b/debian/patches/0003-Remove-additional-gemspec-files.patch
@@ -8,23 +8,20 @@ This is required so that autopkgtest finds the correct gemspec.
  1 files changed, 37 deletions(-)
  delete mode 100644 json_pure.gemspec
 
-diff --git a/json_pure.gemspec b/json_pure.gemspec
-deleted file mode 100644
-index bf7dc79..0000000
 --- a/json_pure.gemspec
 +++ /dev/null
-@@ -1,37 +0,0 @@
+@@ -1,38 +0,0 @@
 -# -*- encoding: utf-8 -*-
--# stub: json_pure 2.0.1 ruby lib
+-# stub: json_pure 2.1.0 ruby lib
 -
 -Gem::Specification.new do |s|
 -  s.name = "json_pure".freeze
--  s.version = "2.0.1"
+-  s.version = "2.1.0"
 -
 -  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
 -  s.require_paths = ["lib".freeze]
 -  s.authors = ["Florian Frank".freeze]
--  s.date = "2016-07-01"
+-  s.date = "2017-04-18"
 -  s.description = "This is a JSON implementation in pure Ruby.".freeze
 -  s.email = "flori at ping.de".freeze
 -  s.extra_rdoc_files = ["README.md".freeze]
@@ -32,7 +29,8 @@ index bf7dc79..0000000
 -  s.homepage = "http://flori.github.com/json".freeze
 -  s.licenses = ["Ruby".freeze]
 -  s.rdoc_options = ["--title".freeze, "JSON implemention for ruby".freeze, "--main".freeze, "README.md".freeze]
--  s.rubygems_version = "2.6.4".freeze
+-  s.required_ruby_version = Gem::Requirement.new(">= 1.9".freeze)
+-  s.rubygems_version = "2.6.11".freeze
 -  s.summary = "JSON Implementation for Ruby".freeze
 -  s.test_files = ["./tests/test_helper.rb".freeze]
 -
diff --git a/debian/patches/0005-Disable-rubygems-usage-in-tests-helper.patch b/debian/patches/0005-Disable-rubygems-usage-in-tests-helper.patch
deleted file mode 100644
index d20116b..0000000
--- a/debian/patches/0005-Disable-rubygems-usage-in-tests-helper.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Disable rubygems usage for dependencies management
-Author: Miguel Landaeta <nomadium at debian.org>
-Forwarded: no
-Last-Update: 2017-03-12
-
---- ruby-json-2.0.1+dfsg.orig/tests/test_helper.rb
-+++ ruby-json-2.0.1+dfsg/tests/test_helper.rb
-@@ -1,4 +1,4 @@
--gem 'json', File.read('VERSION').chomp
-+# gem 'json', File.read('VERSION').chomp
- 
- case ENV['JSON']
- when 'pure'
diff --git a/debian/patches/04-fix-tests-path.patch b/debian/patches/04-fix-tests-path.patch
index 3df29a7..6cbd125 100644
--- a/debian/patches/04-fix-tests-path.patch
+++ b/debian/patches/04-fix-tests-path.patch
@@ -3,10 +3,11 @@ Description: Let debian/ruby-tests.rb handle the test suite loading
 Origin: vendor
 Author: Lucas Nussbaum <lucas at debian.org>
 Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634438
+Last-Update: 2017-07-07
+
 --- a/tests/test_helper.rb
 +++ b/tests/test_helper.rb
-@@ -2,13 +2,10 @@ gem 'json', File.read('VERSION').chomp
- 
+@@ -1,12 +1,9 @@
  case ENV['JSON']
  when 'pure'
 -  $:.unshift 'lib'
diff --git a/debian/patches/series b/debian/patches/series
index 346dc97..ac27de0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 02-fix-fuzz.rb-shebang.patch
 04-fix-tests-path.patch
 0003-Remove-additional-gemspec-files.patch
-0005-Disable-rubygems-usage-in-tests-helper.patch
 0006-Disable-git-usage-during-build-time.patch

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