Merge ~lucaskanashiro/+git/puppet-beaker:relax-version-of-some-deps into ~lucaskanashiro/+git/puppet-beaker:debian/master

[Lucas Kanashiro]

Fixes LP: #1885614. Changes were forwarded to Debian and upstream. Autopkgtest is happy now:

autopkgtest [15:26:39]: test gem2deb-test-runner: gem2deb-test-runner --autopkgtest --check-dependencies 2>&1
autopkgtest [15:26:39]: test gem2deb-test-runner: [-----------------------

┌──────────────────────────────────────────────────────────────────────────────┐
│ Checking Rubygems dependency resolution on ruby2.7 │
└──────────────────────────────────────────────────────────────────────────────┘

GEM_PATH= ruby2.7 -e gem\ \"beaker\"

┌──────────────────────────────────────────────────────────────────────────────┐
│ Run tests for ruby2.7: no test suite! │
└──────────────────────────────────────────────────────────────────────────────┘

autopkgtest [15:26:41]: test gem2deb-test-runner: -----------------------]
autopkgtest [15:26:41]: test gem2deb-test-runner: - - - - - - - - - - results - - - - - - - - - -
gem2deb-test-runner SKIP exit status 77 and marked as skippable

[Christian Ehrhardt  (paelzer)]

Thanks for the upstreaming, reading diff of diff was hard but this LGTM.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thank you Christian! It was uploaded:

$ dput ubuntu ../build-area/puppet-beaker_4.21.0-2ubuntu1_source.changes
Checking signature on .changes
gpg: ../build-area/puppet-beaker_4.21.0-2ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../build-area/puppet-beaker_4.21.0-2ubuntu1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading puppet-beaker_4.21.0-2ubuntu1.dsc: done.
  Uploading puppet-beaker_4.21.0-2ubuntu1.debian.tar.xz: done.
  Uploading puppet-beaker_4.21.0-2ubuntu1_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

migrated
 puppet-beaker | 4.21.0-2ubuntu1 | groovy/universe | source, all

[Christian Ehrhardt  (paelzer)]

I can't set merged on this one, could you please?

diff --git a/debian/changelog b/debian/changelog
index e55f649..312a79d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+puppet-beaker (4.21.0-2ubuntu1) groovy; urgency=medium
+
+  * Relax version constraints of net-s{sh,cp} (LP: #1885614).
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 29 Jun 2020 15:15:20 -0300
+
 puppet-beaker (4.21.0-2) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index 84a66bc..eeebbbc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: puppet-beaker
 Section: admin
 Priority: optional
-Maintainer: Freexian Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Freexian Packaging Team <[e-mail]>
 Uploaders: Sebastien Delafond <[e-mail]>
 Build-Depends: debhelper-compat (= 12),
  gem2deb,
diff --git a/debian/patches/patch-gemspec-for-autopkgtest.patch b/debian/patches/patch-gemspec-for-autopkgtest.patch
index 1d2c285..f9d8ade 100644
--- a/debian/patches/patch-gemspec-for-autopkgtest.patch
+++ b/debian/patches/patch-gemspec-for-autopkgtest.patch
@@ -4,7 +4,7 @@ Description: Patch gemspec to match the version
  the autopkgtest.
 Author: Utkarsh Gupta <[e-mail]>
 Bug-Debian: https://bugs.debian.org/956595
-Last-Update: 2020-04-14
+Last-Update: 2020-06-29
 
 --- a/beaker.gemspec
 +++ b/beaker.gemspec
@@ -27,10 +27,11 @@ Last-Update: 2020-04-14
 -  s.add_runtime_dependency 'rb-readline', '~> 0.5.3'
  
    s.add_runtime_dependency 'hocon', '~> 1.0'
-   s.add_runtime_dependency 'net-ssh', '~> 5.0'
+-  s.add_runtime_dependency 'net-ssh', '~> 5.0'
 -  s.add_runtime_dependency 'net-scp', '~> 1.2'
 -  s.add_runtime_dependency 'inifile', '~> 3.0'
-+  s.add_runtime_dependency 'net-scp', '~> 2.0'
++  s.add_runtime_dependency 'net-ssh', '>= 5.0'
++  s.add_runtime_dependency 'net-scp', '~> 3.0'
  
    s.add_runtime_dependency 'rsync', '~> 1.0.9'
    s.add_runtime_dependency 'open_uri_redirections', '~> 0.2.1'