Package: release.debian.org Control: affects -1 + src:ruby-multi-json X-Debbugs-Cc: ruby-multi-json@packages.debian.org User: release.debian.org@packages.debian.org Usertags: unblock Severity: normal Please unblock package ruby-multi-json This package version fixed a reproducible builds issue. [ Reason ] There was a reproducible builds issue because this package was not rebuilt for 2 years and a half at least. The tooling changed and a simple rebuild was needed to fix it. However, at the time of the upload, we were not on Hard Freeze, so I imported a new minor upstream release. This new release contains exactly one line code change (the remaining changes are testing related). [ Impact ] The package shipped in Trixie will reproducibly build without issue. [ Tests ] autopkgtest is passing and there is no issue with reverse dependencies. [ Risks ] The new minor upstream release does not contain many changes, so I consider the risk of any breakage low. All the packaging changes are just cosmetic and should not introduce any extra risk. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing unblock ruby-multi-json/1.15.0-1
diff -Nru ruby-multi-json-1.14.1/CHANGELOG.md ruby-multi-json-1.15.0/CHANGELOG.md
--- ruby-multi-json-1.14.1/CHANGELOG.md 2019-10-14 23:41:46.000000000 -0300
+++ ruby-multi-json-1.15.0/CHANGELOG.md 2020-07-10 01:51:23.000000000 -0300
@@ -1,3 +1,8 @@
+1.14.2
+------
+
+* [Improve detection of json_gem adapter](https://github.com/intridea/multi_json/commit/62d54019b17ebf83b28c8deb871a02a122e7d9cf)
+
1.14.1
------
diff -Nru ruby-multi-json-1.14.1/debian/changelog ruby-multi-json-1.15.0/debian/changelog
--- ruby-multi-json-1.14.1/debian/changelog 2023-01-02 22:54:11.000000000 -0300
+++ ruby-multi-json-1.15.0/debian/changelog 2025-05-07 15:47:28.000000000 -0300
@@ -1,3 +1,13 @@
+ruby-multi-json (1.15.0-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * Declare compliance with Debian Policy 4.7.2
+ * d/control: runtime depend on instead of ruby:any
+ * d/p/0004-Skip-test-requiring-json-pure.patch: json/pure is not available
+
+ -- Lucas Kanashiro <kanashiro@debian.org> Wed, 07 May 2025 15:47:28 -0300
+
ruby-multi-json (1.14.1-2) unstable; urgency=medium
* Team upload.
diff -Nru ruby-multi-json-1.14.1/debian/control ruby-multi-json-1.15.0/debian/control
--- ruby-multi-json-1.14.1/debian/control 2023-01-02 22:54:11.000000000 -0300
+++ ruby-multi-json-1.15.0/debian/control 2025-05-07 15:47:28.000000000 -0300
@@ -8,7 +8,7 @@
rake,
ruby-oj,
ruby-rspec
-Standards-Version: 4.6.1
+Standards-Version: 4.7.2
Vcs-Git: https://salsa.debian.org/ruby-team/ruby-multi-json.git
Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-multi-json
Homepage: https://github.com/intridea/multi_json
@@ -17,7 +17,7 @@
Package: ruby-multi-json
Architecture: all
-Depends: ruby:any,
+Depends: ${ruby:Depends},
${misc:Depends},
${shlibs:Depends}
Recommends: ruby-oj
diff -Nru ruby-multi-json-1.14.1/debian/patches/0004-Skip-test-requiring-json-pure.patch ruby-multi-json-1.15.0/debian/patches/0004-Skip-test-requiring-json-pure.patch
--- ruby-multi-json-1.14.1/debian/patches/0004-Skip-test-requiring-json-pure.patch 1969-12-31 21:00:00.000000000 -0300
+++ ruby-multi-json-1.15.0/debian/patches/0004-Skip-test-requiring-json-pure.patch 2025-05-07 15:47:28.000000000 -0300
@@ -0,0 +1,22 @@
+From: Lucas Kanashiro <kanashiro@debian.org>
+Date: Wed, 7 May 2025 15:55:36 -0300
+Subject: Skip test requiring json/pure
+
+Forwarded: not-needed
+---
+ spec/multi_json_spec.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/multi_json_spec.rb b/spec/multi_json_spec.rb
+index a960366..962d708 100644
+--- a/spec/multi_json_spec.rb
++++ b/spec/multi_json_spec.rb
+@@ -31,7 +31,7 @@ describe MultiJson do
+ end
+
+ context 'when JSON pure is already loaded' do
+- it 'default_adapter tries to require each adapter in turn and does not assume :json_gem is already loaded' do
++ xit 'default_adapter tries to require each adapter in turn and does not assume :json_gem is already loaded' do
+ require 'json/pure'
+ expect(JSON::JSON_LOADED).to be_truthy
+
diff -Nru ruby-multi-json-1.14.1/debian/patches/series ruby-multi-json-1.15.0/debian/patches/series
--- ruby-multi-json-1.14.1/debian/patches/series 2023-01-02 22:54:11.000000000 -0300
+++ ruby-multi-json-1.15.0/debian/patches/series 2025-05-07 15:47:28.000000000 -0300
@@ -1,3 +1,4 @@
fix_encoding.patch
disable_non_oj_tests
fix-FTBFS-with-ruby-rspec-3.12.patch
+0004-Skip-test-requiring-json-pure.patch
diff -Nru ruby-multi-json-1.14.1/lib/multi_json/version.rb ruby-multi-json-1.15.0/lib/multi_json/version.rb
--- ruby-multi-json-1.14.1/lib/multi_json/version.rb 2019-10-14 23:41:46.000000000 -0300
+++ ruby-multi-json-1.15.0/lib/multi_json/version.rb 2020-07-10 01:51:23.000000000 -0300
@@ -1,8 +1,8 @@
module MultiJson
class Version
MAJOR = 1 unless defined? MultiJson::Version::MAJOR
- MINOR = 14 unless defined? MultiJson::Version::MINOR
- PATCH = 1 unless defined? MultiJson::Version::PATCH
+ MINOR = 15 unless defined? MultiJson::Version::MINOR
+ PATCH = 0 unless defined? MultiJson::Version::PATCH
PRE = nil unless defined? MultiJson::Version::PRE
class << self
diff -Nru ruby-multi-json-1.14.1/lib/multi_json.rb ruby-multi-json-1.15.0/lib/multi_json.rb
--- ruby-multi-json-1.14.1/lib/multi_json.rb 2019-10-14 23:41:46.000000000 -0300
+++ ruby-multi-json-1.15.0/lib/multi_json.rb 2020-07-10 01:51:23.000000000 -0300
@@ -47,7 +47,7 @@
return :oj if defined?(::Oj)
return :yajl if defined?(::Yajl)
return :jr_jackson if defined?(::JrJackson)
- return :json_gem if defined?(::JSON::JSON_LOADED)
+ return :json_gem if defined?(::JSON::Ext::Parser)
return :gson if defined?(::Gson)
REQUIREMENT_MAP.each do |adapter, library|
diff -Nru ruby-multi-json-1.14.1/README.md ruby-multi-json-1.15.0/README.md
--- ruby-multi-json-1.14.1/README.md 2019-10-14 23:41:46.000000000 -0300
+++ ruby-multi-json-1.15.0/README.md 2020-07-10 01:51:23.000000000 -0300
@@ -68,6 +68,7 @@
* Ruby 2.4
* Ruby 2.5
* Ruby 2.6
+* Ruby 2.7
* [JRuby][]
If something doesn't work in one of these implementations, it's a bug.
diff -Nru ruby-multi-json-1.14.1/spec/multi_json_spec.rb ruby-multi-json-1.15.0/spec/multi_json_spec.rb
--- ruby-multi-json-1.14.1/spec/multi_json_spec.rb 2019-10-14 23:41:46.000000000 -0300
+++ ruby-multi-json-1.15.0/spec/multi_json_spec.rb 2020-07-10 01:51:23.000000000 -0300
@@ -30,6 +30,24 @@
end
end
+ context 'when JSON pure is already loaded' do
+ it 'default_adapter tries to require each adapter in turn and does not assume :json_gem is already loaded' do
+ require 'json/pure'
+ expect(JSON::JSON_LOADED).to be_truthy
+
+ undefine_constants :Oj, :Yajl, :Gson, :JrJackson do
+ # simulate that the json_gem is not loaded
+ ext = defined?(JSON::Ext::Parser) ? JSON::Ext.send(:remove_const, :Parser) : nil
+ begin
+ expect(MultiJson).to receive(:require)
+ MultiJson.default_adapter
+ ensure
+ JSON::Ext::Parser = ext if ext
+ end
+ end
+ end
+ end
+
context 'caching' do
before { MultiJson.use adapter }
let(:adapter) { MultiJson::Adapters::JsonGem }
diff -Nru ruby-multi-json-1.14.1/.travis.yml ruby-multi-json-1.15.0/.travis.yml
--- ruby-multi-json-1.14.1/.travis.yml 2019-10-14 23:41:46.000000000 -0300
+++ ruby-multi-json-1.15.0/.travis.yml 2020-07-10 01:51:23.000000000 -0300
@@ -43,6 +43,9 @@
- rvm: 2.6
gemfile: gemfiles/gemfile-2-3
env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
+ - rvm: 2.7
+ gemfile: gemfiles/gemfile-2-3
+ env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
- rvm: ruby-head
gemfile: gemfiles/gemfile-2-3
env: SKIP_ADAPTERS=gson,jr_jackson,nsjsonserialization
@@ -51,4 +54,4 @@
env: SKIP_ADAPTERS=oj,yajl,jr_jackson,nsjsonserialization
- rvm: jruby-head
gemfile: gemfiles/gemfile-2-jruby
- env: SKIP_ADAPTERS=oj,yajl,jr_jackson,nsjsonserialization
\ No newline at end of file
+ env: SKIP_ADAPTERS=oj,yajl,jr_jackson,nsjsonserialization
Attachment:
signature.asc
Description: This is a digitally signed message part