diff -pruN 0.38.7+ds1-2/debian/changelog 0.38.7+ds1-2ubuntu2/debian/changelog
--- 0.38.7+ds1-2/debian/changelog	2021-02-04 08:55:35.000000000 +0000
+++ 0.38.7+ds1-2ubuntu2/debian/changelog	2021-11-30 19:48:20.000000000 +0000
@@ -1,3 +1,20 @@
+cadvisor (0.38.7+ds1-2ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild against Go 1.17
+
+ -- William 'jawn-smith' Wilson <jawn-smith@ubuntu.com>  Tue, 30 Nov 2021 13:48:20 -0600
+
+cadvisor (0.38.7+ds1-2ubuntu1) impish; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add dependency on golang-github-opencontainers-go-digest-dev,
+      golang-github-opencontainers-image-spec-dev,
+      golang-github-seandolphin-bqschema-dev,
+      golang-github-containerd-ttrpc-dev, and
+      golang-github-containerd-typeurl-dev
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 27 Apr 2021 20:21:47 -0700
+
 cadvisor (0.38.7+ds1-2) unstable; urgency=medium
 
   * Add patch to build with runc rc93
@@ -5,6 +22,17 @@ cadvisor (0.38.7+ds1-2) unstable; urgenc
 
  -- Shengjing Zhu <zhsj@debian.org>  Thu, 04 Feb 2021 16:55:35 +0800
 
+cadvisor (0.38.7+ds1-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add dependency on golang-github-opencontainers-go-digest-dev,
+      golang-github-opencontainers-image-spec-dev,
+      golang-github-seandolphin-bqschema-dev,
+      golang-github-containerd-ttrpc-dev, and
+      golang-github-containerd-typeurl-dev
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 29 Jan 2021 12:54:47 -0800
+
 cadvisor (0.38.7+ds1-1) unstable; urgency=medium
 
   * New upstream version 0.38.7+ds1
@@ -15,6 +43,17 @@ cadvisor (0.38.7+ds1-1) unstable; urgenc
 
  -- Shengjing Zhu <zhsj@debian.org>  Fri, 15 Jan 2021 02:30:13 +0800
 
+cadvisor (0.37.0+ds1-2ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add dependency on golang-github-opencontainers-go-digest-dev,
+      golang-github-opencontainers-image-spec-dev,
+      golang-github-seandolphin-bqschema-dev,
+      golang-github-containerd-ttrpc-dev, and
+      golang-github-containerd-typeurl-dev
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 30 Nov 2020 12:25:16 -0800
+
 cadvisor (0.37.0+ds1-2) unstable; urgency=medium
 
   * Upload to unstable
@@ -41,6 +80,32 @@ cadvisor (0.37.0+ds1-1) experimental; ur
 
  -- Shengjing Zhu <zhsj@debian.org>  Wed, 19 Aug 2020 02:25:43 +0800
 
+cadvisor (0.35.0+ds1-4ubuntu3) hirsute; urgency=medium
+
+  * No-change rebuild using new golang
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 11 Nov 2020 22:06:00 +0000
+
+cadvisor (0.35.0+ds1-4ubuntu2) groovy; urgency=medium
+
+  * Add containerd support back (See LP 1884663)
+    - Drop d/p/0008-disable-containerd.patch
+    - Add dependency on golang-github-containerd-containerd-dev,
+      golang-github-containerd-ttrpc-dev, golang-github-containerd-typeurl-dev
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Wed, 15 Jul 2020 11:56:04 -0300
+
+cadvisor (0.35.0+ds1-4ubuntu1) groovy; urgency=medium
+
+  * d/p/0008-disable-containerd.patch: golang-github-containerd-containerd-dev
+    is not working due to the vendorized dependencies (LP: #1884663) 
+  * Add dependency on golang-github-opencontainers-go-digest-dev,
+    golang-github-opencontainers-image-spec-dev, and
+    golang-github-seandolphin-bqschema-dev. Those packages were indirectly
+    provided by containerd.
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Tue, 23 Jun 2020 15:50:56 -0300
+
 cadvisor (0.35.0+ds1-4) unstable; urgency=medium
 
   * Skip one more problem test on s390x
@@ -263,3 +328,4 @@ cadvisor (0.19.3+dfsg-1) unstable; urgen
   * Initial release (Closes: #797988).
 
  -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 10 Nov 2015 18:17:27 +1100
+
diff -pruN 0.38.7+ds1-2/debian/control 0.38.7+ds1-2ubuntu2/debian/control
--- 0.38.7+ds1-2/debian/control	2021-02-04 08:55:35.000000000 +0000
+++ 0.38.7+ds1-2ubuntu2/debian/control	2021-04-28 03:21:47.000000000 +0000
@@ -1,13 +1,15 @@
 Source: cadvisor
 Section: admin
 Priority: optional
-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Go Packaging Team <team+pkg-go@tracker.debian.org>
 Uploaders: Shengjing Zhu <zhsj@debian.org>,
 Build-Depends: debhelper-compat (= 13),
                dh-golang,
                golang-any,
                golang-github-blang-semver-dev,
                golang-github-containerd-containerd-dev,
+               golang-github-containerd-ttrpc-dev,
                golang-github-containerd-typeurl-dev,
                golang-github-docker-go-connections-dev,
                golang-github-docker-go-units-dev,
@@ -18,6 +20,8 @@ Build-Depends: debhelper-compat (= 13),
                golang-github-karrick-godirwalk-dev,
                golang-github-kr-pretty-dev,
                golang-github-mesos-mesos-go-dev,
+               golang-github-opencontainers-go-digest-dev,
+               golang-github-opencontainers-image-spec-dev,
                golang-github-opencontainers-runc-dev (>= 1.0.0~rc93),
                golang-github-opencontainers-specs-dev,
                golang-github-pkg-errors-dev,
@@ -25,6 +29,7 @@ Build-Depends: debhelper-compat (= 13),
                golang-github-prometheus-client-model-dev,
                golang-github-prometheus-common-dev,
                golang-github-rican7-retry-dev,
+               golang-github-seandolphin-bqschema-dev,
                golang-github-shopify-sarama-dev,
                golang-github-stretchr-testify-dev,
                golang-go-zfs-dev,
@@ -47,18 +52,23 @@ Section: golang
 Architecture: all
 Depends: golang-github-blang-semver-dev,
          golang-github-containerd-containerd-dev,
+         golang-github-containerd-ttrpc-dev,
+         golang-github-containerd-typeurl-dev,
          golang-github-docker-go-connections-dev,
          golang-github-docker-go-units-dev,
          golang-github-euank-go-kmsg-parser-dev,
          golang-github-go-logr-logr-dev,
          golang-github-gogo-protobuf-dev,
          golang-github-karrick-godirwalk-dev,
+         golang-github-opencontainers-go-digest-dev,
+         golang-github-opencontainers-image-spec-dev,
          golang-github-opencontainers-runc-dev (>= 1.0.0~rc93),
          golang-github-opencontainers-specs-dev,
          golang-github-pkg-errors-dev,
          golang-github-prometheus-client-golang-dev,
          golang-github-prometheus-client-model-dev,
          golang-github-prometheus-common-dev,
+         golang-github-seandolphin-bqschema-dev,
          golang-go-zfs-dev,
          golang-golang-x-net-dev,
          golang-golang-x-sys-dev,
