diff -pruN 4.2.1-1/debian/changelog 4.2.1-1ubuntu1/debian/changelog
--- 4.2.1-1/debian/changelog	2020-08-25 23:31:24.000000000 +0000
+++ 4.2.1-1ubuntu1/debian/changelog	2020-09-11 10:59:29.000000000 +0000
@@ -1,3 +1,10 @@
+supervisor (4.2.1-1ubuntu1) groovy; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Only build-depend on python3, not python3-all.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Fri, 11 Sep 2020 12:59:29 +0200
+
 supervisor (4.2.1-1) unstable; urgency=medium
 
   * New upstream version 4.2.1
@@ -12,6 +19,13 @@ supervisor (4.2.0-2) unstable; urgency=m
 
  -- Samuel Henrique <samueloph@debian.org>  Thu, 06 Aug 2020 20:15:28 +0100
 
+supervisor (4.2.0-1ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Only build-depend on python3, not python3-all.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 04 May 2020 10:46:58 -0700
+
 supervisor (4.2.0-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
@@ -29,6 +43,12 @@ supervisor (4.2.0-1) unstable; urgency=m
 
  -- Samuel Henrique <samueloph@debian.org>  Mon, 04 May 2020 11:59:15 +0100
 
+supervisor (4.1.0-1ubuntu1) focal; urgency=medium
+
+  * Only build-depend on python3, not python3-all.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 31 Oct 2019 22:32:49 -0700
+
 supervisor (4.1.0-1) unstable; urgency=medium
 
   * New upstream version 4.1.0
@@ -198,3 +218,4 @@ supervisor (3.0a7-1) unstable; urgency=l
   * Initial release (Closes: #491665).
 
  -- Anders Hammarquist <iko@debian.org>  Thu, 30 Jul 2009 11:29:24 +0200
+
diff -pruN 4.2.1-1/debian/control 4.2.1-1ubuntu1/debian/control
--- 4.2.1-1/debian/control	2020-08-25 23:31:24.000000000 +0000
+++ 4.2.1-1ubuntu1/debian/control	2020-09-11 10:59:29.000000000 +0000
@@ -1,12 +1,13 @@
 Source: supervisor
 Section: admin
 Priority: optional
-Maintainer: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 Uploaders: Samuel Henrique <samueloph@debian.org>, Stéphane Blondon <sblondon@debian.org>
 Build-Depends:
  debhelper-compat (= 13),
  dh-python,
- python3-all,
+ python3,
  python3-pkg-resources,
  python3-setuptools,
  python3-sphinx,