diff -pruN 1.218-5/debian/changelog 1.218-5ubuntu1/debian/changelog
--- 1.218-5/debian/changelog	2022-03-11 20:54:15.000000000 +0000
+++ 1.218-5ubuntu1/debian/changelog	2022-05-17 16:27:43.000000000 +0000
@@ -1,3 +1,11 @@
+netcat-openbsd (1.218-5ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't build-depend on strace on i386 where it's unavailable.
+  * Drop netcat transitional package, because netcat 1.10-47 dropped it
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Tue, 17 May 2022 18:27:43 +0200
+
 netcat-openbsd (1.218-5) unstable; urgency=low
 
   [ Dirk Jagdmann ]
@@ -50,6 +58,16 @@ netcat-openbsd (1.218-5) unstable; urgen
 
  -- Guilhem Moulin <guilhem@debian.org>  Fri, 11 Mar 2022 21:54:15 +0100
 
+netcat-openbsd (1.218-4ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes (LP: #1961983):
+    - Move the netcat transitional package here and have it depend on the
+      preferred netcat-openbsd implementation of netcat, not
+      netcat-traditional.
+    - Don't build-depend on strace on i386 where it's unavailable.
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Wed, 23 Feb 2022 12:09:43 +0100
+
 netcat-openbsd (1.218-4) unstable; urgency=medium
 
   * d/checks/*: Allow test suite to fail due to the high rate of false
@@ -57,6 +75,16 @@ netcat-openbsd (1.218-4) unstable; urgen
 
  -- Guilhem Moulin <guilhem@debian.org>  Sat, 19 Feb 2022 11:33:57 +0100
 
+netcat-openbsd (1.218-3ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Move the netcat transitional package here and have it depend on the
+      preferred netcat-openbsd implementation of netcat, not
+      netcat-traditional.
+    - Don't build-depend on strace on i386 where it's unavailable.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 13 Dec 2021 23:37:43 -0800
+
 netcat-openbsd (1.218-3) unstable; urgency=medium
 
   * Upload to unstable.
@@ -116,6 +144,21 @@ netcat-openbsd (1.218-2+exp1) experiment
 
  -- Guilhem Moulin <guilhem@debian.org>  Sun, 14 Nov 2021 17:17:26 +0100
 
+netcat-openbsd (1.218-2ubuntu2) jammy; urgency=medium
+
+  * Don't build-depend on strace on i386 where it's unavailable.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 08 Dec 2021 00:17:56 +0000
+
+netcat-openbsd (1.218-2ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable (LP: #1950985). Remaining changes:
+    - Move the netcat transitional package here and have it depend on the
+      peferred netcat-openbsd implementation of netcat, not
+      netcat-traditional.
+
+ -- Dave Jones <dave.jones@canonical.com>  Sun, 14 Nov 2021 09:42:30 +0000
+
 netcat-openbsd (1.218-2) unstable; urgency=low
 
   * d/checks: Fix FTBS on some platforms:
@@ -161,6 +204,21 @@ netcat-openbsd (1.217.1-1) unstable; urg
 
  -- Guilhem Moulin <guilhem@debian.org>  Mon, 16 Aug 2021 03:14:05 +0200
 
+netcat-openbsd (1.217-3ubuntu2) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 07 Oct 2021 12:21:24 +0200
+
+netcat-openbsd (1.217-3ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Move the netcat transitional package here and have it depend on the
+      peferred netcat-openbsd implementation of netcat, not
+      netcat-traditional.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 06 Jan 2021 14:06:46 -0800
+
 netcat-openbsd (1.217-3) unstable; urgency=low
 
   [ Debian Janitor ]
@@ -174,6 +232,15 @@ netcat-openbsd (1.217-3) unstable; urgen
 
  -- Guilhem Moulin <guilhem@debian.org>  Sat, 19 Dec 2020 00:11:23 +0100
 
+netcat-openbsd (1.217-2ubuntu1) groovy; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Move the netcat transitional package here and have it depend on the
+      peferred netcat-openbsd implementation of netcat, not
+      netcat-traditional.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 09 Jun 2020 13:21:58 -0700
+
 netcat-openbsd (1.217-2) unstable; urgency=low
 
   * d/patches: Make getnameinfo(3) errors non-fatal in report_sock():
@@ -206,6 +273,14 @@ netcat-openbsd (1.217-1) unstable; urgen
 
  -- Guilhem Moulin <guilhem@debian.org>  Sat, 23 May 2020 02:04:39 +0200
 
+netcat-openbsd (1.206-1ubuntu1) focal; urgency=medium
+
+  * Move the netcat transitional package here and have it depend on the
+    preferred netcat-openbsd implementation of netcat, not
+    netcat-traditional.  LP: #1780316.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 09 Mar 2020 11:50:15 -0700
+
 netcat-openbsd (1.206-1) unstable; urgency=medium
 
   * New upstream release (from OpenBSD 6.6)
diff -pruN 1.218-5/debian/control 1.218-5ubuntu1/debian/control
--- 1.218-5/debian/control	2022-03-11 20:54:15.000000000 +0000
+++ 1.218-5ubuntu1/debian/control	2022-05-17 16:21:41.000000000 +0000
@@ -1,7 +1,8 @@
 Source: netcat-openbsd
 Section: net
 Priority: important
-Maintainer: Guilhem Moulin <guilhem@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Guilhem Moulin <guilhem@debian.org>
 Standards-Version: 4.6.0
 Rules-Requires-Root: no
 Build-Depends: debhelper-compat (= 13),
@@ -9,7 +10,7 @@ Build-Depends: debhelper-compat (= 13),
                libbsd-dev,
                pkg-config,
                procps [linux-any] <!nocheck>,
-               strace [linux-any] <!nocheck>
+               strace [!i386] <!nocheck>
 Vcs-Git: https://salsa.debian.org/debian/netcat-openbsd.git -b debian/latest
 Vcs-Browser: https://salsa.debian.org/debian/netcat-openbsd