diff -Nru etcd-3.2.26+dfsg/debian/changelog etcd-3.2.26+dfsg/debian/changelog
--- etcd-3.2.26+dfsg/debian/changelog	2020-01-10 16:29:10.000000000 +0100
+++ etcd-3.2.26+dfsg/debian/changelog	2022-02-02 11:19:29.000000000 +0100
@@ -1,3 +1,11 @@
+etcd (3.2.26+dfsg-6ubuntu0.1) focal; urgency=medium
+
+  * Fix FTBFS (LP: #1959757):
+    - Downgrade Build-Depends on golang-github-prometheus-client-golang-dev (>= 0.9.2~)
+    - Drop patch fix-prometheus-for-new-version.patch
+
+ -- Eduardo Barretto <eduardo.barretto@canonical.com>  Wed, 02 Feb 2022 11:19:29 +0100
+
 etcd (3.2.26+dfsg-6) unstable; urgency=medium
 
   * Team upload.
diff -Nru etcd-3.2.26+dfsg/debian/control etcd-3.2.26+dfsg/debian/control
--- etcd-3.2.26+dfsg/debian/control	2020-01-10 16:29:10.000000000 +0100
+++ etcd-3.2.26+dfsg/debian/control	2022-02-02 11:19:29.000000000 +0100
@@ -1,5 +1,6 @@
 Source: etcd
-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: Jelmer Vernooij <jelmer@debian.org>,
            Tim Potter <tpot@hpe.com>,
            Anthony Fok <foka@debian.org>,
@@ -28,7 +29,7 @@
                golang-github-kr-pty-dev (>= 1.0.0~),
                golang-github-mattn-go-runewidth-dev (>= 0.0.2~),
                golang-github-olekukonko-tablewriter-dev (>= 0.0~git20170122.0.a0225b3~),
-               golang-github-prometheus-client-golang-dev (>= 1.0.0~),
+               golang-github-prometheus-client-golang-dev (>= 0.9.2~),
                golang-github-prometheus-common-dev (>= 0+git20170220.49fee29),
                golang-github-spf13-cobra-dev,
                golang-github-spf13-pflag-dev,
diff -Nru etcd-3.2.26+dfsg/debian/patches/series etcd-3.2.26+dfsg/debian/patches/series
--- etcd-3.2.26+dfsg/debian/patches/series	2020-01-10 16:29:10.000000000 +0100
+++ etcd-3.2.26+dfsg/debian/patches/series	2022-02-02 11:18:53.000000000 +0100
@@ -5,4 +5,4 @@
 spelling-error.patch
 integration-functional-Eliminate-direct-use-of-gRPC-.patch
 pkg-transport-Limit-InvalidCipherSuites-to-TLS12.patch
-fix-prometheus-for-new-version.patch
+#fix-prometheus-for-new-version.patch, dropping it as focal version is older