diff -Nru autodep8-0.21ubuntu2/debian/changelog autodep8-0.22ubuntu1/debian/changelog
--- autodep8-0.21ubuntu2/debian/changelog	2020-01-15 16:31:57.000000000 +0000
+++ autodep8-0.22ubuntu1/debian/changelog	2020-03-04 11:36:19.000000000 +0000
@@ -1,3 +1,28 @@
+autodep8 (0.22ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Drop doing python2 import tests, as they are superfecial, and we
+    have removed too many of them to make python2 import tests succeed
+    often.
+    - Revert: dkms: add missing `@` in Depends: line of generated test
+    control files. We must not install the packages as a dependency else
+    we will attempt to install the dkms packages immediatly and if they
+    fail to build we will abort the test.  This prevents us from grabbing
+    the make.log.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 04 Mar 2020 11:36:19 +0000
+
+autodep8 (0.22) unstable; urgency=medium
+
+  [ Debian Janitor ]
+  * Bump debhelper from old 11 to 12.
+  * Set debhelper-compat version in Build-Depends.
+
+  [ Antonio Terceiro ]
+  * ruby: add "Restrictions: skippable"
+
+ -- Antonio Terceiro <terceiro@debian.org>  Wed, 08 Jan 2020 18:00:47 -0300
+
 autodep8 (0.21ubuntu2) focal; urgency=medium
 
   * Drop doing python2 import tests, as they are superfecial, and we have
@@ -315,3 +340,4 @@
   * Initial release.
 
  -- Antonio Terceiro <terceiro@debian.org>  Sat, 20 Sep 2014 10:45:21 -0300
+
diff -Nru autodep8-0.21ubuntu2/debian/compat autodep8-0.22ubuntu1/debian/compat
--- autodep8-0.21ubuntu2/debian/compat	2019-12-02 01:17:13.000000000 +0000
+++ autodep8-0.22ubuntu1/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-11
diff -Nru autodep8-0.21ubuntu2/debian/control autodep8-0.22ubuntu1/debian/control
--- autodep8-0.21ubuntu2/debian/control	2020-01-15 16:31:57.000000000 +0000
+++ autodep8-0.22ubuntu1/debian/control	2020-01-15 23:10:47.000000000 +0000
@@ -7,7 +7,7 @@
            Martin Pitt <mpitt@debian.org>,
            Paul Gevers <elbrus@debian.org>,
            Rafael Laboissiere <rafael@debian.org>
-Build-Depends: debhelper (>= 11), dctrl-tools, shunit2, python3
+Build-Depends: debhelper-compat (= 12), dctrl-tools, shunit2, python3
 Standards-Version: 4.4.1
 Vcs-Git: https://salsa.debian.org/ci-team/autodep8.git
 Vcs-Browser: https://salsa.debian.org/ci-team/autodep8
diff -Nru autodep8-0.21ubuntu2/support/ruby/generate autodep8-0.22ubuntu1/support/ruby/generate
--- autodep8-0.21ubuntu2/support/ruby/generate	2019-12-02 01:17:13.000000000 +0000
+++ autodep8-0.22ubuntu1/support/ruby/generate	2020-01-15 23:10:48.000000000 +0000
@@ -21,4 +21,5 @@
 Test-Command: gem2deb-test-runner --autopkgtest --check-dependencies 2>&1
 Depends: @, $builddeps gem2deb-test-runner
 Features: test-name=gem2deb-test-runner
+Restrictions: skippable
 EOF