Control: tags 1019616 + patch Control: tags 1019616 + pending Dear maintainer,
I've prepared an NMU for ruby-dalli (versioned as 3.0.6-1.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru ruby-dalli-3.0.6/debian/changelog ruby-dalli-3.0.6/debian/changelog --- ruby-dalli-3.0.6/debian/changelog 2021-12-07 04:49:10.000000000 +0200 +++ ruby-dalli-3.0.6/debian/changelog 2022-10-15 16:54:27.000000000 +0300 @@ -1,3 +1,10 @@ +ruby-dalli (3.0.6-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with Ruby 3.1. (Closes: #1019616) + + -- Adrian Bunk <b...@debian.org> Sat, 15 Oct 2022 16:54:27 +0300 + ruby-dalli (3.0.6-1) unstable; urgency=medium * Team upload. diff -Nru ruby-dalli-3.0.6/debian/patches/0001-Adding-Ruby-3.1-to-CI-workflow-886.patch ruby-dalli-3.0.6/debian/patches/0001-Adding-Ruby-3.1-to-CI-workflow-886.patch --- ruby-dalli-3.0.6/debian/patches/0001-Adding-Ruby-3.1-to-CI-workflow-886.patch 1970-01-01 02:00:00.000000000 +0200 +++ ruby-dalli-3.0.6/debian/patches/0001-Adding-Ruby-3.1-to-CI-workflow-886.patch 2022-10-15 16:49:18.000000000 +0300 @@ -0,0 +1,46 @@ +From d65244d02babd7aa23a4ea8dd3b3a955393bcbac Mon Sep 17 00:00:00 2001 +From: Peter Goldstein <peter.m.goldst...@gmail.com> +Date: Sat, 25 Dec 2021 15:34:35 -0800 +Subject: Adding Ruby 3.1 to CI workflow (#886) + +* Adding Ruby 3.1 to CI workflow + +* Fix rubocop-performance lint issue, make tests compatible with error_highlight +--- + test/protocol/test_value_serializer.rb | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/test/protocol/test_value_serializer.rb b/test/protocol/test_value_serializer.rb +index 436fc9c..0127c18 100644 +--- a/test/protocol/test_value_serializer.rb ++++ b/test/protocol/test_value_serializer.rb +@@ -228,7 +228,7 @@ describe Dalli::Protocol::ValueSerializer do + vs.retrieve(raw_value, Dalli::Protocol::ValueSerializer::FLAG_SERIALIZED) + end + end +- assert_equal exception.message, error_message ++ assert_equal error_message, exception.message + end + end + +@@ -244,7 +244,7 @@ describe Dalli::Protocol::ValueSerializer do + vs.retrieve(raw_value, Dalli::Protocol::ValueSerializer::FLAG_SERIALIZED) + end + end +- assert_equal exception.message, "Unable to unmarshal value: #{error_message}" ++ assert exception.message.start_with?("Unable to unmarshal value: #{error_message}") + end + end + +@@ -259,7 +259,7 @@ describe Dalli::Protocol::ValueSerializer do + vs.retrieve(raw_value, Dalli::Protocol::ValueSerializer::FLAG_SERIALIZED) + end + end +- assert_equal exception.message, error_message ++ assert exception.message.start_with?(error_message) + end + end + +-- +2.30.2 + diff -Nru ruby-dalli-3.0.6/debian/patches/series ruby-dalli-3.0.6/debian/patches/series --- ruby-dalli-3.0.6/debian/patches/series 2021-12-07 04:49:10.000000000 +0200 +++ ruby-dalli-3.0.6/debian/patches/series 2022-10-15 16:54:26.000000000 +0300 @@ -2,3 +2,4 @@ 0003-dalli-version.patch 0004-No-bundler-in-test-helper.patch 0006-Fix-Dalli-NameError.patch +0001-Adding-Ruby-3.1-to-CI-workflow-886.patch