diff -Nru ruby-ridley-5.1.1/debian/changelog ruby-ridley-5.1.1/debian/changelog --- ruby-ridley-5.1.1/debian/changelog 2017-08-23 17:40:29.000000000 +0000 +++ ruby-ridley-5.1.1/debian/changelog 2018-03-04 10:14:30.000000000 +0000 @@ -1,10 +1,25 @@ -ruby-ridley (5.1.1-0ubuntu1) artful; urgency=medium +ruby-ridley (5.1.1-1) unstable; urgency=medium - * New upstream release - * Drop 0005-Update-varia-model-dependency.patch - * Update dependencies versions. + [ Miguel Landaeta ] + * New upstream release. (Closes: #870308) + * Remove myself from Uploaders list. (Closes: #890767) + * Remove unneeded patch d/p/0005-Update-varia-model-dependency.patch. + * Bump DH compat level to 11. + * Bump Standards-Version to 4.1.3. No changes were required. + * Update Homepage field. + * Set Rules-Requires-Root to no. + * Migrate Vcs-* URLs to salsa. + * Update copyright info. + * Remove redundant dependencies. - -- Gianfranco Costamagna Wed, 23 Aug 2017 19:40:29 +0200 + [ Hleb Valoshka ] + * New upstream release. + * Add myself to Uploaders list. + * Update dependencies. + * Add patch to relax ruby-buff-shell-out dependency. + * Update disabled networked tests with one more. + + -- Hleb Valoshka <375gnu@gmail.com> Sun, 04 Mar 2018 10:14:30 +0000 ruby-ridley (4.4.3-2) unstable; urgency=medium diff -Nru ruby-ridley-5.1.1/debian/compat ruby-ridley-5.1.1/debian/compat --- ruby-ridley-5.1.1/debian/compat 2016-03-22 10:20:06.000000000 +0000 +++ ruby-ridley-5.1.1/debian/compat 2018-03-04 10:06:11.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru ruby-ridley-5.1.1/debian/control ruby-ridley-5.1.1/debian/control --- ruby-ridley-5.1.1/debian/control 2017-08-23 17:40:29.000000000 +0000 +++ ruby-ridley-5.1.1/debian/control 2018-03-04 10:13:04.000000000 +0000 @@ -2,22 +2,22 @@ Section: ruby Priority: optional Maintainer: Debian Ruby Extras Maintainers -Uploaders: Miguel Landaeta +Uploaders: Hleb Valoshka <375gnu@gmail.com> Build-Depends: chef-zero (>= 1.5), - debhelper (>= 9~), + debhelper (>= 11~), gem2deb, rake, ruby-addressable, - ruby-buff-config (>= 1.0), - ruby-buff-extensions (>= 2.0.0), + ruby-buff-config (>= 2.0), + ruby-buff-extensions (>= 2.0), ruby-buff-ignore (>= 1.2), ruby-buff-ruby-engine (>= 0.1), - ruby-buff-shell-out (>= 1.0), + ruby-buff-shell-out (>= 0.2), ruby-celluloid (>= 0.16.0), ruby-celluloid-io (>= 0.16.0), ruby-chef-config (>= 12.5.0), ruby-erubis, - ruby-faraday (>= 0.9), + ruby-faraday (>= 0.9.0), ruby-hashie (>= 2.0.2), ruby-httpclient (>= 2.7), ruby-json (>= 1.7.7), @@ -26,18 +26,15 @@ ruby-retryable (>= 2.0), ruby-rspec, ruby-rspec-its, - ruby-semverse (>= 2.0), - ruby-buff-ruby-engine (>= 0.1), - ruby-json-spec, - ruby-webmock, - chef-zero (>= 1.5), - ruby-varia-model (>= 0.6.0), + ruby-semverse (>= 1.1), + ruby-varia-model (>= 0.6), ruby-webmock -Standards-Version: 3.9.7 -Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-ridley.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-ridley.git -Homepage: https://github.com/RiotGames/ridley +Standards-Version: 4.1.3 +Vcs-Git: https://salsa.debian.org/ruby-team/ruby-ridley +Vcs-Browser: https://salsa.debian.org/ruby-team/ruby-ridley +Homepage: https://github.com/berkshelf/ridley XS-Ruby-Versions: all +Rules-Require-Root: no Package: ruby-ridley Architecture: all @@ -45,21 +42,21 @@ Depends: ruby | ruby-interpreter, ruby-addressable, ruby-buff-config (>= 2.0), - ruby-buff-extensions (>= 2.0.0), + ruby-buff-extensions (>= 2.0), ruby-buff-ignore (>= 1.2), - ruby-buff-shell-out (>= 1.0), + ruby-buff-shell-out (>= 0.2), ruby-celluloid (>= 0.16.0), ruby-celluloid-io (>= 0.16.0), ruby-chef-config (>= 12.5.0), ruby-erubis, - ruby-faraday (>= 0.9), + ruby-faraday (>= 0.9.0), ruby-hashie (>= 2.0.2), ruby-httpclient (>= 2.7), ruby-json (>= 1.7.7), ruby-mixlib-authentication (>= 1.3.0), ruby-retryable (>= 2.0), - ruby-semverse (>= 2.0), - ruby-varia-model (>= 0.6.0), + ruby-semverse (>= 1.1), + ruby-varia-model (>= 0.6), ${misc:Depends}, ${shlibs:Depends} Description: Ruby library that provides a full featured Chef API client diff -Nru ruby-ridley-5.1.1/debian/copyright ruby-ridley-5.1.1/debian/copyright --- ruby-ridley-5.1.1/debian/copyright 2016-03-22 10:20:06.000000000 +0000 +++ ruby-ridley-5.1.1/debian/copyright 2018-03-04 10:06:11.000000000 +0000 @@ -1,13 +1,15 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ridley -Source: https://github.com/reset/ridley +Source: https://github.com/berkshelf/ridley Files: * Copyright: 2012-2013 Riot Games + 2012-2013 Jamie Winsor + 2012-2013 Kyle Allan License: Apache-2.0 Files: debian/* -Copyright: 2014-2015 Miguel Landaeta +Copyright: 2014-2018 Miguel Landaeta License: Apache-2.0 Comment: the Debian packaging is licensed under the same terms as the original package. diff -Nru ruby-ridley-5.1.1/debian/patches/0003-Disable-tests-that-require-network.patch ruby-ridley-5.1.1/debian/patches/0003-Disable-tests-that-require-network.patch --- ruby-ridley-5.1.1/debian/patches/0003-Disable-tests-that-require-network.patch 2017-08-23 17:40:29.000000000 +0000 +++ ruby-ridley-5.1.1/debian/patches/0003-Disable-tests-that-require-network.patch 2018-03-04 10:06:11.000000000 +0000 @@ -2,11 +2,24 @@ Date: Mon, 10 Aug 2015 11:35:21 +0300 Subject: Disable tests that require network -Index: ruby-ridley-5.1.1/spec/unit/ridley/connection_spec.rb -=================================================================== ---- ruby-ridley-5.1.1.orig/spec/unit/ridley/connection_spec.rb -+++ ruby-ridley-5.1.1/spec/unit/ridley/connection_spec.rb -@@ -35,7 +35,7 @@ +--- + spec/unit/ridley/connection_spec.rb | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/spec/unit/ridley/connection_spec.rb b/spec/unit/ridley/connection_spec.rb +index 4d92fbc..cd62978 100644 +--- a/spec/unit/ridley/connection_spec.rb ++++ b/spec/unit/ridley/connection_spec.rb +@@ -14,7 +14,7 @@ describe Ridley::Connection do + described_class.new('http://127.0.0.1:8889', client_name, client_key) + end + +- it "fails with http_proxy set without no_proxy" do ++ xit "fails with http_proxy set without no_proxy" do + stub_const('ENV', ENV.to_hash.merge( + 'http_proxy' => 'http://i.am.an.http.proxy') + ) +@@ -35,7 +35,7 @@ describe Ridley::Connection do stub_request(:get, "https://api.opscode.com/organizations/vialstudios").to_return(status: 500, body: "") end @@ -15,7 +28,7 @@ expect { subject.get('organizations/vialstudios') }.to raise_error(Ridley::Errors::HTTPInternalServerError) -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ describe Ridley::Connection do described_class.new(server_url, client_name, client_key, retries: 2) end @@ -24,7 +37,7 @@ expect { subject.get('organizations/vialstudios') }.to raise_error(Ridley::Errors::HTTPInternalServerError) -@@ -80,17 +80,17 @@ +@@ -80,17 +80,17 @@ describe Ridley::Connection do stub_request(:get, "http://test.it/file").to_return(status: 200, body: contents) end diff -Nru ruby-ridley-5.1.1/debian/patches/0004-Relax-ruby-buff-shell-out-dependency.patch ruby-ridley-5.1.1/debian/patches/0004-Relax-ruby-buff-shell-out-dependency.patch --- ruby-ridley-5.1.1/debian/patches/0004-Relax-ruby-buff-shell-out-dependency.patch 1970-01-01 00:00:00.000000000 +0000 +++ ruby-ridley-5.1.1/debian/patches/0004-Relax-ruby-buff-shell-out-dependency.patch 2018-03-04 10:06:11.000000000 +0000 @@ -0,0 +1,22 @@ +From: Hleb Valoshka <375gnu@gmail.com> +Date: Mon, 26 Feb 2018 23:40:19 +0300 +Subject: Relax ruby-buff-shell-out dependency + +It doesn't have any actual code changes. +--- + ridley.gemspec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ridley.gemspec b/ridley.gemspec +index 77c3157..fc6eb99 100644 +--- a/ridley.gemspec ++++ b/ridley.gemspec +@@ -22,7 +22,7 @@ Gem::Specification.new do |s| + s.add_dependency 'buff-config', '~> 2.0' + s.add_dependency 'buff-extensions', '~> 2.0' + s.add_dependency 'buff-ignore', '~> 1.2' +- s.add_dependency 'buff-shell_out', '~> 1.0' ++ s.add_dependency 'buff-shell_out', '>= 0.2' + s.add_dependency 'celluloid', '~> 0.16.0' + s.add_dependency 'celluloid-io', '~> 0.16.1' + s.add_dependency 'chef-config', '>= 12.5.0' diff -Nru ruby-ridley-5.1.1/debian/patches/series ruby-ridley-5.1.1/debian/patches/series --- ruby-ridley-5.1.1/debian/patches/series 2017-08-23 17:40:29.000000000 +0000 +++ ruby-ridley-5.1.1/debian/patches/series 2018-03-04 10:06:11.000000000 +0000 @@ -1,3 +1,4 @@ 0004-Disable-tests-depending-on-old-chef-zero-behaviours.patch 0003-Disable-tests-that-require-network.patch 0001-Don-t-use-rubygems-bundler-and-spork-in-tests-use-rs.patch +0004-Relax-ruby-buff-shell-out-dependency.patch diff -Nru ruby-ridley-5.1.1/debian/rules ruby-ridley-5.1.1/debian/rules --- ruby-ridley-5.1.1/debian/rules 2016-03-22 10:20:06.000000000 +0000 +++ ruby-ridley-5.1.1/debian/rules 2018-03-04 10:06:11.000000000 +0000 @@ -16,4 +16,4 @@ override_dh_auto_clean: dh_auto_clean - -cd spec/tmp && rm -f .chef/knife.rb config.rb + - if [ -d spec/tmp ]; then cd spec/tmp && rm -f .chef/knife.rb config.rb; fi