diff -pruN 15-3/debian/changelog 15-3ubuntu1/debian/changelog
--- 15-3/debian/changelog	2025-11-04 19:33:36.000000000 +0000
+++ 15-3ubuntu1/debian/changelog	2025-12-06 15:21:43.000000000 +0000
@@ -1,3 +1,11 @@
+tang (15-3ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    d/p/ubuntu/adv_socat_test_timeout.patch: Increase timeout for the
+    adv-socat test.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 06 Dec 2025 15:21:43 +0000
+
 tang (15-3) unstable; urgency=medium
 
   * Test: Also increase the adv-standalone-endpoint timeout
@@ -5,6 +13,14 @@ tang (15-3) unstable; urgency=medium
 
  -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Tue, 04 Nov 2025 20:33:36 +0100
 
+tang (15-2ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    d/p/ubuntu/adv_socat_test_timeout.patch: Increase timeout for the
+    adv-socat test.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Fri, 05 Jul 2024 21:48:46 +0100
+
 tang (15-2) unstable; urgency=medium
 
   * tang-show-keys: Probe for curl, add documentation
@@ -19,6 +35,13 @@ tang (15-1) unstable; urgency=medium
 
  -- Christoph Biedl <debian.axhn@manchmal.in-ulm.de>  Thu, 16 May 2024 08:27:06 +0200
 
+tang (14-2ubuntu1) noble; urgency=medium
+
+  * Increase timeout for the adv-socat test (LP: #2048479)
+    d/p/ubuntu/adv_socat_test_timeout.patch (Closes: #1060248)
+
+ -- Heinrich Schuchardt <heinrich.schuchardt@canonical.com>  Mon, 08 Jan 2024 01:26:38 +0100
+
 tang (14-2) unstable; urgency=medium
 
   * Increase timeout for the adv-standalone test
diff -pruN 15-3/debian/control 15-3ubuntu1/debian/control
--- 15-3/debian/control	2025-11-04 19:33:36.000000000 +0000
+++ 15-3ubuntu1/debian/control	2025-12-06 15:21:43.000000000 +0000
@@ -1,5 +1,6 @@
 Source: tang
-Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Homepage: https://github.com/latchset/tang
 Standards-Version: 4.7.2
 Vcs-Browser: https://git.in-ulm.de/cbiedl/tang
diff -pruN 15-3/debian/patches/series 15-3ubuntu1/debian/patches/series
--- 15-3/debian/patches/series	2025-11-02 20:29:24.000000000 +0000
+++ 15-3ubuntu1/debian/patches/series	2025-12-06 15:21:43.000000000 +0000
@@ -10,3 +10,6 @@ debian/2021-09-30.use-var-lib.patch
 debian/2021-09-30.xinetd-support.patch
 debian/2023-07-04.test-timeout.patch
 debian/2024-05-31.hint-curl.patch
+
+# patches for Ubuntu
+ubuntu/adv_socat_test_timeout.patch
diff -pruN 15-3/debian/patches/ubuntu/adv_socat_test_timeout.patch 15-3ubuntu1/debian/patches/ubuntu/adv_socat_test_timeout.patch
--- 15-3/debian/patches/ubuntu/adv_socat_test_timeout.patch	1970-01-01 00:00:00.000000000 +0000
+++ 15-3ubuntu1/debian/patches/ubuntu/adv_socat_test_timeout.patch	2025-12-06 15:21:43.000000000 +0000
@@ -0,0 +1,18 @@
+Subject: Increase timeout for the adv-socat test
+Author: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
+Date: 2024-01-08
+Forwarded: yes
+
+The adv-socat test tends to often fail on armhf due to timeouts.
+
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -42,7 +42,7 @@ endif
+ 
+ test('adv-standalone', find_program('adv-standalone'), env: env, timeout: 1200)
+ test('adv-standalone-endpoint', find_program('adv-standalone-endpoint'), env: env, timeout: 1200)
+-test('adv-socat', find_program('adv-socat'), env: env, timeout: 360)
++test('adv-socat', find_program('adv-socat'), env: env, timeout: 1200)
+ test('adv-socat-endpoint', find_program('adv-socat-endpoint'), env: env, timeout: 360)
+ test('rec-standalone', find_program('rec-standalone'), env: env, timeout: 360)
+ test('rec-standalone-endpoint', find_program('rec-standalone-endpoint'), env: env, timeout: 360)