diff -pruN 3.4.0-1/debian/changelog 3.4.0-1ubuntu1/debian/changelog
--- 3.4.0-1/debian/changelog	2022-10-21 05:54:41.000000000 +0000
+++ 3.4.0-1ubuntu1/debian/changelog	2022-11-21 12:49:52.000000000 +0000
@@ -1,3 +1,10 @@
+php-amqplib (3.4.0-1ubuntu1) lunar; urgency=medium
+
+  * d/p/0005-Skip-flaky-functional-test.php: Skip flaky DEP8 test.
+    (LP: #1997246)
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Mon, 21 Nov 2022 09:49:52 -0300
+
 php-amqplib (3.4.0-1) unstable; urgency=medium
 
   [ Ramūnas Dronga ]
diff -pruN 3.4.0-1/debian/control 3.4.0-1ubuntu1/debian/control
--- 3.4.0-1/debian/control	2022-10-21 05:51:12.000000000 +0000
+++ 3.4.0-1ubuntu1/debian/control	2022-11-21 12:49:52.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-amqplib
 Section: php
 Priority: optional
-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: David Prévot <taffit@debian.org>
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-phpcomposer,
diff -pruN 3.4.0-1/debian/patches/0005-Skip-flaky-functional-test.php 3.4.0-1ubuntu1/debian/patches/0005-Skip-flaky-functional-test.php
--- 3.4.0-1/debian/patches/0005-Skip-flaky-functional-test.php	1970-01-01 00:00:00.000000000 +0000
+++ 3.4.0-1ubuntu1/debian/patches/0005-Skip-flaky-functional-test.php	2022-11-21 12:49:52.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Skip flaky test on autopkgtest infrastructure
+Author: Athos Ribeiro <athos.ribeiro@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php-amqplib/+bug/1997246
+Forwarded: no
+Last-Update: 2022-11-23
+
+--- a/tests/Functional/Connection/Heartbeat/SIGHeartbeatSenderTest.php
++++ b/tests/Functional/Connection/Heartbeat/SIGHeartbeatSenderTest.php
+@@ -108,6 +108,7 @@
+      */
+     public function alarm_sig_should_be_registered_when_conn_is_writing()
+     {
++        $this->markTestSkipped('Skip flaky test on autopkgtest infrastructure');
+         $connection = $this->getMockBuilder(AbstractConnection::class)
+             ->setMethods(['isConnected', 'getHeartbeat', 'isWriting', 'getLastActivity'])
+             ->disableOriginalConstructor()
diff -pruN 3.4.0-1/debian/patches/series 3.4.0-1ubuntu1/debian/patches/series
--- 3.4.0-1/debian/patches/series	2022-10-21 05:52:38.000000000 +0000
+++ 3.4.0-1ubuntu1/debian/patches/series	2022-11-21 12:49:52.000000000 +0000
@@ -2,3 +2,4 @@
 0003-Drop-use-of-unhandled-v1-v2-version-by-pkg-php-tools.patch
 0003-Use-php-phpseclib3.patch
 0004-Use-TLS-v1.3.patch
+0005-Skip-flaky-functional-test.php