diff -pruN 1.31.0-5/debian/changelog 1.31.0-5ubuntu1/debian/changelog
--- 1.31.0-5/debian/changelog	2025-02-24 20:19:16.000000000 +0000
+++ 1.31.0-5ubuntu1/debian/changelog	2025-05-26 13:36:28.000000000 +0000
@@ -1,3 +1,13 @@
+php-symfony-polyfill (1.31.0-5ubuntu1) questing; urgency=medium
+
+  * Merge with Debian unstable (LP: #2111725). Remaining changes:
+    - d/tests: drop dep8 tests due to ICU discrepancies between Ubuntu and
+      Debian
+    - d/rules: do not fail upon build time tests. Ubuntu uses ICU from
+      experimental
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Mon, 26 May 2025 10:36:28 -0300
+
 php-symfony-polyfill (1.31.0-5) unstable; urgency=medium
 
   * Use php-apcu and php-curl for tests
@@ -6,6 +16,15 @@ php-symfony-polyfill (1.31.0-5) unstable
 
  -- David Prévot <taffit@debian.org>  Mon, 24 Feb 2025 21:19:16 +0100
 
+php-symfony-polyfill (1.31.0-4ubuntu1) plucky; urgency=medium
+
+  * d/tests: drop dep8 tests due to ICU discrepancies between Ubuntu and
+    Debian
+  * d/rules: do not fail upon build time tests. Ubuntu uses ICU from
+    experimental
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Thu, 27 Feb 2025 14:22:30 -0300
+
 php-symfony-polyfill (1.31.0-4) unstable; urgency=medium
 
   * Use php-odbc for tests
diff -pruN 1.31.0-5/debian/control 1.31.0-5ubuntu1/debian/control
--- 1.31.0-5/debian/control	2025-02-24 20:19:08.000000000 +0000
+++ 1.31.0-5ubuntu1/debian/control	2025-05-26 13:36:28.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-symfony-polyfill
 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: Daniel Beyer <dabe@deb.ymc.ch>, David Prévot <taffit@debian.org>
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-phpcomposer,
diff -pruN 1.31.0-5/debian/rules 1.31.0-5ubuntu1/debian/rules
--- 1.31.0-5/debian/rules	2025-02-24 20:19:08.000000000 +0000
+++ 1.31.0-5ubuntu1/debian/rules	2025-05-26 13:35:52.000000000 +0000
@@ -49,7 +49,7 @@ execute_after_dh_auto_build:
 	cp debian/autoload-tests.php vendor/autoload.php
 
 override_dh_auto_test:
-	phpunit
+	-phpunit
 
 override_dh_install:
 	dh_install --package=php-symfony-polyfill
diff -pruN 1.31.0-5/debian/tests/control 1.31.0-5ubuntu1/debian/tests/control
--- 1.31.0-5/debian/tests/control	2025-02-24 20:03:50.000000000 +0000
+++ 1.31.0-5ubuntu1/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-Test-Command: mkdir -p vendor && cp debian/autoload-tests.php vendor/autoload.php && phpunit
-Restrictions: allow-stderr
-Depends: php-apcu,
-         php-curl,
-         php-intl,
-         php-ldap,
-         php-mbstring,
-         php-mysql,
-         php-odbc,
-         php-symfony-intl (>> 6.4.12),
-         php-symfony-var-dumper (>> 6.4.12),
-         php-uuid,
-         phpunit,
-         @