Merge ~lucaskanashiro/ubuntu/+source/gem2deb:fix-regression-on-armhf into ubuntu/+source/gem2deb:ubuntu/devel

[Lucas Kanashiro]

There is an autopkgtest regression on armhf because the armhf testbed is a container executed on top of a bionic host with a not so recent kernel. Actually, it is an issue when calling reprotest (which is used in DEP-8 tests):

https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-focal/focal/armhf/g/gem2deb/20200311_020802_c6e4e@/log.gz

And thanks to Andreas we found a solution here:

https://<email address hidden>/msg01176.html

This solution has been applied in other packages in Debian as well. I discussed about it with the Debian maintainer and he agreed on the proposed change, and I already commited it in Debian git repo:

https://salsa.debian.org/ruby-team/gem2deb/-/commit/75a8a98db90ff9aafc6304f09c6f5631006c334e

So this delta should be dropped in the next release. I tested this patch and it makes autopkgtest happy in an armhf container running in a bionic host:

autopkgtest [23:47:49]: @@@@@@@@@@@@@@@@@@@@ summary
testsuite PASS
gem2deb PASS
gem2deb-test-runner-autopkgtest PASS
reproducible-extensions PASS
reproducible-extensions-vendor PASS

Here is the PPA:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-gem2deb-regression-fix/+packages

[Andreas Hasenack (ahasenack)]

Looking at this now

[Andreas Hasenack (ahasenack)]

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Tagging and uploading 6342e8b05838dac9813b0973bd4de98b04b11131

$ git push pkg upload/1.0.5ubuntu1
Enumerating objects: 20, done.
Counting objects: 100% (20/20), done.
Delta compression using up to 4 threads
Compressing objects: 100% (14/14), done.
Writing objects: 100% (14/14), 1.66 KiB | 106.00 KiB/s, done.
Total 14 (delta 10), reused 0 (delta 0)
remote: Checking connectivity: 14, done.
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/gem2deb
 * [new tag] upload/1.0.5ubuntu1 -> upload/1.0.5ubuntu1

$ dput ubuntu ../gem2deb_1.0.5ubuntu1_source.changes
Checking signature on .changes
gpg: ../gem2deb_1.0.5ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../gem2deb_1.0.5ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading gem2deb_1.0.5ubuntu1.dsc: done.
  Uploading gem2deb_1.0.5ubuntu1.tar.xz: done.
  Uploading gem2deb_1.0.5ubuntu1_source.buildinfo: done.
  Uploading gem2deb_1.0.5ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated into focal release.

diff --git a/debian/changelog b/debian/changelog
index e0a9ee1..1b710b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gem2deb (1.0.5ubuntu1) focal; urgency=medium
+
+  * d/t/reproducible-extensions: add -kernel option to reprotest call. It
+    fixes an autopkgtest regression on armhf.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 11 Mar 2020 20:47:30 -0300
+
 gem2deb (1.0.5) unstable; urgency=medium
 
   [ Antonio Terceiro ]
diff --git a/debian/control b/debian/control
index f83ffed..fe8269d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: gem2deb
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Ruby Extras Maintainers <[e-mail]>
 Uploaders: Lucas Nussbaum <[e-mail]>,
            Antonio Terceiro <[e-mail]>,
            Gunnar Wolf <[e-mail]>,
diff --git a/debian/tests/reproducible-extensions b/debian/tests/reproducible-extensions
index 0a811da..e6d6296 100755
--- a/debian/tests/reproducible-extensions
+++ b/debian/tests/reproducible-extensions
@@ -14,5 +14,5 @@ if [ "$(basename $0)" = "reproducible-extensions-vendor" ]; then
 fi
 DEB_BUILD_OPTIONS=nocheck \
   reprotest \
-    --variations=+all,-fileordering,-user_group,-domain_host \
+    --variations=+all,-kernel,-fileordering,-user_group,-domain_host \
     .