diff -pruN 2.3-1/debian/changelog 2.3-1ubuntu1/debian/changelog
--- 2.3-1/debian/changelog	2021-12-09 06:55:56.000000000 +0000
+++ 2.3-1ubuntu1/debian/changelog	2021-12-14 17:25:14.000000000 +0000
@@ -1,3 +1,11 @@
+abi-compliance-checker (2.3-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/patches/oom-exec-helper.patch: fix bad syntax, 'next' not allowed
+      in a do {} while but is allowed in a while {}.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 14 Dec 2021 09:25:14 -0800
+
 abi-compliance-checker (2.3-1) unstable; urgency=medium
 
   * d/patches: statx and statx_timestamp need to be skipped. Closes: #916294
@@ -8,6 +16,13 @@ abi-compliance-checker (2.3-1) unstable;
 
  -- Mathieu Malaterre <malat@debian.org>  Thu, 09 Dec 2021 07:55:56 +0100
 
+abi-compliance-checker (2.3-0.2ubuntu1) focal; urgency=medium
+
+  * debian/patches/oom-exec-helper.patch: fix bad syntax, 'next' not allowed
+    in a do {} while but is allowed in a while {}.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 22 Dec 2019 11:08:00 -0600
+
 abi-compliance-checker (2.3-0.2) unstable; urgency=medium
 
   * Non-maintainer upload
@@ -277,3 +292,4 @@ abi-compliance-checker (1.1-1) unstable;
   * Initial release (Closes: #540247)
 
  -- Ryan Niebur <ryanryan52@gmail.com>  Thu, 06 Aug 2009 14:43:30 -0700
+
diff -pruN 2.3-1/debian/control 2.3-1ubuntu1/debian/control
--- 2.3-1/debian/control	2021-12-09 06:55:26.000000000 +0000
+++ 2.3-1ubuntu1/debian/control	2021-12-14 17:25:14.000000000 +0000
@@ -2,7 +2,8 @@ Source: abi-compliance-checker
 Section: devel
 Priority: optional
 Build-Depends: debhelper (>= 10), dpkg-dev (>= 1.16.1~), help2man
-Maintainer: Mathieu Malaterre <malat@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Mathieu Malaterre <malat@debian.org>
 Standards-Version: 4.6.0
 Homepage: https://github.com/lvc/abi-compliance-checker/
 XS-Testsuite: autopkgtest
diff -pruN 2.3-1/debian/patches/oom-exec-helper.patch 2.3-1ubuntu1/debian/patches/oom-exec-helper.patch
--- 2.3-1/debian/patches/oom-exec-helper.patch	2021-12-09 06:49:16.000000000 +0000
+++ 2.3-1ubuntu1/debian/patches/oom-exec-helper.patch	2021-12-09 10:01:04.000000000 +0000
@@ -88,7 +88,7 @@ Index: abi-compliance-checker-2.3/abi-co
 +sub exec_helper(@)
 +{
 +    my ($reader, $writer) = @_;
-+    do {
++    while(1) {
 +        chomp($line = <$reader>);
 +	next if (!$line);
 +        if ($line eq 'exit') {
@@ -96,7 +96,7 @@ Index: abi-compliance-checker-2.3/abi-co
 +        }
 +        system($line);
 +        print $writer "$? $!\n";
-+    } while(1);
++    }
 +}
 +
  sub scenario()