Merge ~lucaskanashiro/ubuntu/+source/apt-clone:fix-autopkgtest into ubuntu/+source/apt-clone:ubuntu/devel

[Lucas Kanashiro]

Fix autopkgtest failure. The DEP-8 test is failing because it depends on ubuntu-archive-keyring which does not exist in the archive. The fix replaces the dependency on ubuntu-archive-keyring by ubuntu-keyring, and it was forwarded upstream here:

https://github.com/mvo5/apt-clone/pull/14

This is the test failure log:

https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-hirsute/hirsute/amd64/a/apt-clone/20210127_145044_77992@/log.gz

autopkgtest result with proposed change:

autopkgtest [16:30:50]: @@@@@@@@@@@@@@@@@@@@ summary
run-tests PASS

PPA with proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/apt-clone/+packages

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Lucas.

I confirmed here that update-maintainer doesn't do anything because the maintainer is already an Ubuntu member. Also confirmed that ubuntu-keyring exists both in Ubuntu and in Debian, while ubuntu-archive-keyring only exists in Debian (and is currently removed from testing).

LGTM, thanks.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Thanks Sergio. Uploaded:

$ git push pkg upload/0.4.3ubuntu1
Enumerating objects: 15, done.
Counting objects: 100% (15/15), done.
Delta compression using up to 8 threads
Compressing objects: 100% (10/10), done.
Writing objects: 100% (10/10), 1.16 KiB | 1.16 MiB/s, done.
Total 10 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/apt-clone
 * [new tag] upload/0.4.3ubuntu1 -> upload/0.4.3ubuntu1
$ dput ubuntu ../apt-clone_0.4.3ubuntu1_source.changes
Checking signature on .changes
gpg: ../apt-clone_0.4.3ubuntu1_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../apt-clone_0.4.3ubuntu1.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading apt-clone_0.4.3ubuntu1.dsc: done.
  Uploading apt-clone_0.4.3ubuntu1.tar.xz: done.
  Uploading apt-clone_0.4.3ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 9e4198d..fd34b53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt-clone (0.4.3ubuntu1) hirsute; urgency=medium
+
+  * d/t/control: depend on ubuntu-keyring instead of ubuntu-archive-keyring.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 27 Jan 2021 15:26:20 -0300
+
 apt-clone (0.4.3) unstable; urgency=medium
 
   * debian: update test dependencies
diff --git a/debian/tests/control b/debian/tests/control
index bd115b8..6d11ad9 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
 Tests: run-tests
-Depends: @, pyflakes3, python3-apt, pycodestyle, python3-mock, python3-distro-info, make, ubuntu-archive-keyring
+Depends: @, pyflakes3, python3-apt, pycodestyle, python3-mock, python3-distro-info, make, ubuntu-keyring