diff -Nru ruby-sinatra-2.0.8.1/debian/changelog ruby-sinatra-2.0.8.1/debian/changelog --- ruby-sinatra-2.0.8.1/debian/changelog 2020-02-07 11:23:28.000000000 +0000 +++ ruby-sinatra-2.0.8.1/debian/changelog 2020-04-08 00:07:16.000000000 +0000 @@ -1,3 +1,11 @@ +ruby-sinatra (2.0.8.1-2) unstable; urgency=medium + + * Team upload + * Refresh patches + * Add upstream patches to fix warnings on ruby2.7 + + -- Antonio Terceiro Tue, 07 Apr 2020 21:07:16 -0300 + ruby-sinatra (2.0.8.1-1) unstable; urgency=medium * Team upload. diff -Nru ruby-sinatra-2.0.8.1/debian/patches/0005-Fix-additional-Ruby-2.7-keyword-warnings-1586.patch ruby-sinatra-2.0.8.1/debian/patches/0005-Fix-additional-Ruby-2.7-keyword-warnings-1586.patch --- ruby-sinatra-2.0.8.1/debian/patches/0005-Fix-additional-Ruby-2.7-keyword-warnings-1586.patch 1970-01-01 00:00:00.000000000 +0000 +++ ruby-sinatra-2.0.8.1/debian/patches/0005-Fix-additional-Ruby-2.7-keyword-warnings-1586.patch 2020-04-08 00:07:16.000000000 +0000 @@ -0,0 +1,59 @@ +From: Stefan Sundin +Date: Fri, 13 Mar 2020 06:34:36 -0700 +Subject: Fix additional Ruby 2.7 keyword warnings (#1586) + +Fix additional Ruby 2.7 keyword warnings. +--- + sinatra-contrib/lib/sinatra/namespace.rb | 2 +- + sinatra-contrib/lib/sinatra/reloader.rb | 4 ++-- + sinatra-contrib/lib/sinatra/respond_with.rb | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/sinatra-contrib/lib/sinatra/namespace.rb b/sinatra-contrib/lib/sinatra/namespace.rb +index 07b53f7..2998651 100644 +--- a/sinatra-contrib/lib/sinatra/namespace.rb ++++ b/sinatra-contrib/lib/sinatra/namespace.rb +@@ -332,7 +332,7 @@ module Sinatra + def prefixed(method, pattern = nil, conditions = {}, &block) + default = %r{(?:/.*)?} if method == :before or method == :after + pattern, conditions = compile pattern, conditions, default +- result = base.send(method, pattern, conditions, &block) ++ result = base.send(method, pattern, **conditions, &block) + invoke_hook :route_added, method.to_s.upcase, pattern, block + result + end +diff --git a/sinatra-contrib/lib/sinatra/reloader.rb b/sinatra-contrib/lib/sinatra/reloader.rb +index 9b12c6c..0949681 100644 +--- a/sinatra-contrib/lib/sinatra/reloader.rb ++++ b/sinatra-contrib/lib/sinatra/reloader.rb +@@ -269,7 +269,7 @@ module Sinatra + # + # Note: We are using #compile! so we don't interfere with extensions + # changing #route. +- def compile!(verb, path, block, options = {}) ++ def compile!(verb, path, block, **options) + source_location = block.respond_to?(:source_location) ? + block.source_location.first : caller_files[1] + signature = super +@@ -302,7 +302,7 @@ module Sinatra + # Does everything Sinatra::Base#add_filter does, but it also tells + # the +Watcher::List+ for the Sinatra application to watch the defined + # filter. +- def add_filter(type, path = nil, options = {}, &block) ++ def add_filter(type, path = nil, **options, &block) + source_location = block.respond_to?(:source_location) ? + block.source_location.first : caller_files[1] + result = super +diff --git a/sinatra-contrib/lib/sinatra/respond_with.rb b/sinatra-contrib/lib/sinatra/respond_with.rb +index 0545929..605c267 100644 +--- a/sinatra-contrib/lib/sinatra/respond_with.rb ++++ b/sinatra-contrib/lib/sinatra/respond_with.rb +@@ -221,7 +221,7 @@ module Sinatra + + private + +- def compile!(verb, path, block, options = {}) ++ def compile!(verb, path, block, **options) + options[:provides] ||= respond_to if respond_to + super + end diff -Nru ruby-sinatra-2.0.8.1/debian/patches/0006-Update-Rack-handler-call-to-use-kw-args.patch ruby-sinatra-2.0.8.1/debian/patches/0006-Update-Rack-handler-call-to-use-kw-args.patch --- ruby-sinatra-2.0.8.1/debian/patches/0006-Update-Rack-handler-call-to-use-kw-args.patch 1970-01-01 00:00:00.000000000 +0000 +++ ruby-sinatra-2.0.8.1/debian/patches/0006-Update-Rack-handler-call-to-use-kw-args.patch 2020-04-08 00:07:16.000000000 +0000 @@ -0,0 +1,37 @@ +From: Jordan Owens +Date: Wed, 18 Mar 2020 15:36:27 -0400 +Subject: Update Rack handler call to use kw args + +Ruby 2.6 will fail because of a warning from Puma, at least until its Rack +handler is updated. +--- + lib/sinatra/base.rb | 2 +- + test/integration_test.rb | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb +index f5d7729..324df5e 100644 +--- a/lib/sinatra/base.rb ++++ b/lib/sinatra/base.rb +@@ -1523,7 +1523,7 @@ module Sinatra + # behavior, by ensuring an instance exists: + prototype + # Run the instance we created: +- handler.run(self, server_settings) do |server| ++ handler.run(self, **server_settings) do |server| + unless suppress_messages? + $stderr.puts "== Sinatra (v#{Sinatra::VERSION}) has taken the stage on #{port} for #{environment} with backup from #{handler_name}" + end +diff --git a/test/integration_test.rb b/test/integration_test.rb +index feda6e0..1e9f41b 100644 +--- a/test/integration_test.rb ++++ b/test/integration_test.rb +@@ -89,7 +89,7 @@ class IntegrationTest < Minitest::Test + it 'does not generate warnings' do + assert_raises(OpenURI::HTTPError) { server.get '/' } + server.get '/app_file' +- assert_equal [], server.warnings ++ assert_equal [], server.warnings unless server.reel? + end + + it 'sets the Content-Length response header when sending files' do diff -Nru ruby-sinatra-2.0.8.1/debian/patches/Drop-bluecloth-development-dependency.patch ruby-sinatra-2.0.8.1/debian/patches/Drop-bluecloth-development-dependency.patch --- ruby-sinatra-2.0.8.1/debian/patches/Drop-bluecloth-development-dependency.patch 2020-02-07 11:23:28.000000000 +0000 +++ ruby-sinatra-2.0.8.1/debian/patches/Drop-bluecloth-development-dependency.patch 2020-04-08 00:07:16.000000000 +0000 @@ -8,11 +8,11 @@ Gemfile | 1 - 1 file changed, 1 deletion(-) -Index: ruby-sinatra/Gemfile -=================================================================== ---- ruby-sinatra.orig/Gemfile 2020-02-07 11:21:46.942912350 +0000 -+++ ruby-sinatra/Gemfile 2020-02-07 11:21:46.938912120 +0000 -@@ -35,7 +35,6 @@ +diff --git a/Gemfile b/Gemfile +index df2f593..a79b976 100644 +--- a/Gemfile ++++ b/Gemfile +@@ -35,7 +35,6 @@ if RUBY_ENGINE == "ruby" gem 'therubyracer' gem 'redcarpet' gem 'wlang', '>= 2.0.1' diff -Nru ruby-sinatra-2.0.8.1/debian/patches/fix-relative-path.patch ruby-sinatra-2.0.8.1/debian/patches/fix-relative-path.patch --- ruby-sinatra-2.0.8.1/debian/patches/fix-relative-path.patch 2020-02-07 11:23:28.000000000 +0000 +++ ruby-sinatra-2.0.8.1/debian/patches/fix-relative-path.patch 2020-04-08 00:07:16.000000000 +0000 @@ -1,8 +1,18 @@ -Index: ruby-sinatra/test/indifferent_hash_test.rb +From: Debian Ruby Extras Maintainers + +Date: Tue, 7 Apr 2020 21:05:00 -0300 +Subject: fix-relative-path + =================================================================== ---- ruby-sinatra.orig/test/indifferent_hash_test.rb 2020-02-07 11:21:49.079034928 +0000 -+++ ruby-sinatra/test/indifferent_hash_test.rb 2020-02-07 11:21:49.075034698 +0000 -@@ -8,7 +8,7 @@ +--- + test/indifferent_hash_test.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/indifferent_hash_test.rb b/test/indifferent_hash_test.rb +index 88d9e73..30330d8 100644 +--- a/test/indifferent_hash_test.rb ++++ b/test/indifferent_hash_test.rb +@@ -8,7 +8,7 @@ require 'minitest/autorun' unless defined?(Minitest) # outside of the full suite, on older Rubies. ENV['SINATRA_ACTIVESUPPORT_WARNING'] = 'false' diff -Nru ruby-sinatra-2.0.8.1/debian/patches/i18n-fix.patch ruby-sinatra-2.0.8.1/debian/patches/i18n-fix.patch --- ruby-sinatra-2.0.8.1/debian/patches/i18n-fix.patch 2020-02-07 11:23:28.000000000 +0000 +++ ruby-sinatra-2.0.8.1/debian/patches/i18n-fix.patch 2020-04-08 00:07:16.000000000 +0000 @@ -6,11 +6,11 @@ test/helper.rb | 3 +++ 1 file changed, 3 insertions(+) -Index: ruby-sinatra/test/helper.rb -=================================================================== ---- ruby-sinatra.orig/test/helper.rb 2020-02-07 11:21:43.314704598 +0000 -+++ ruby-sinatra/test/helper.rb 2020-02-07 11:21:43.314704598 +0000 -@@ -37,6 +37,9 @@ +diff --git a/test/helper.rb b/test/helper.rb +index afbc50a..5b224ef 100644 +--- a/test/helper.rb ++++ b/test/helper.rb +@@ -37,6 +37,9 @@ require 'active_support/core_ext/hash/keys' require 'sinatra/base' diff -Nru ruby-sinatra-2.0.8.1/debian/patches/series ruby-sinatra-2.0.8.1/debian/patches/series --- ruby-sinatra-2.0.8.1/debian/patches/series 2020-02-07 11:23:28.000000000 +0000 +++ ruby-sinatra-2.0.8.1/debian/patches/series 2020-04-08 00:07:16.000000000 +0000 @@ -2,3 +2,5 @@ Drop-bluecloth-development-dependency.patch fix-relative-path.patch test_haml-update-for-haml-5.patch +0005-Fix-additional-Ruby-2.7-keyword-warnings-1586.patch +0006-Update-Rack-handler-call-to-use-kw-args.patch diff -Nru ruby-sinatra-2.0.8.1/debian/patches/test_haml-update-for-haml-5.patch ruby-sinatra-2.0.8.1/debian/patches/test_haml-update-for-haml-5.patch --- ruby-sinatra-2.0.8.1/debian/patches/test_haml-update-for-haml-5.patch 2020-02-07 11:23:28.000000000 +0000 +++ ruby-sinatra-2.0.8.1/debian/patches/test_haml-update-for-haml-5.patch 2020-04-08 00:07:16.000000000 +0000 @@ -8,11 +8,11 @@ test/haml_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: ruby-sinatra/test/haml_test.rb -=================================================================== ---- ruby-sinatra.orig/test/haml_test.rb 2020-02-07 11:21:51.187156087 +0000 -+++ ruby-sinatra/test/haml_test.rb 2020-02-07 11:21:51.183155857 +0000 -@@ -31,13 +31,13 @@ +diff --git a/test/haml_test.rb b/test/haml_test.rb +index f2e713d..7e61fa3 100644 +--- a/test/haml_test.rb ++++ b/test/haml_test.rb +@@ -31,13 +31,13 @@ class HAMLTest < Minitest::Test end get '/' assert ok?