diff -pruN 287/debian/changelog 287ubuntu1/debian/changelog
--- 287/debian/changelog	2025-11-11 17:06:11.000000000 +0000
+++ 287ubuntu1/debian/changelog	2025-11-21 07:57:15.000000000 +0000
@@ -1,3 +1,13 @@
+postgresql-common (287ubuntu1) resolute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - t/090_multicluster.t: skip port change test due to a regression in rust
+      coreutils (LP 2125504) (LP: #2125057)
+    - Ignore postgresql tests results on ppc64el and s390x for now, they go
+      OOM
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 21 Nov 2025 08:57:15 +0100
+
 postgresql-common (287) unstable; urgency=medium
 
   * Drop postgresql-common -> postgresql-common-dev dependency.
@@ -30,6 +40,13 @@ postgresql-common (283) unstable; urgenc
 
  -- Christoph Berg <myon@debian.org>  Wed, 10 Sep 2025 14:23:07 +0200
 
+postgresql-common (282ubuntu1) questing; urgency=medium
+
+  * t/090_multicluster.t: skip port change test due to a regression in rust
+    coreutils (LP 2125504) (LP: #2125057)
+
+ -- Athos Ribeiro <athos.ribeiro@canonical.com>  Tue, 30 Sep 2025 12:23:30 -0300
+
 postgresql-common (282) unstable; urgency=medium
 
   * pg_upgradecluster "dump" method improvements:
diff -pruN 287/debian/control 287ubuntu1/debian/control
--- 287/debian/control	2025-10-11 10:53:02.000000000 +0000
+++ 287ubuntu1/debian/control	2025-11-11 21:16:14.000000000 +0000
@@ -1,7 +1,8 @@
 Source: postgresql-common
 Section: database
 Priority: optional
-Maintainer: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org>
 Uploaders:
  Martin Pitt <mpitt@debian.org>,
  Christoph Berg <myon@debian.org>,
diff -pruN 287/server/postgresql.mk 287ubuntu1/server/postgresql.mk
--- 287/server/postgresql.mk	2025-06-30 10:13:28.000000000 +0000
+++ 287ubuntu1/server/postgresql.mk	2025-11-21 07:57:15.000000000 +0000
@@ -161,7 +161,8 @@ endif
 # powerpc fails thread test on postgresql-16
 # sh4 lets qemu segfaults when building postgresql-16
 # sparc64 fails bin/summarization-and-inprogress-insertion test with postgresql-15
-ifneq ($(filter alpha hppa hurd% ia64 kfreebsd% powerpc sh4 sparc64,$(DEB_HOST_ARCH)),)
+# ppc64el and s390x are going OOM when postgresql-18 tests are running
+ifneq ($(filter alpha hppa hurd% ia64 kfreebsd% powerpc sh4 sparc64 ppc64el s390x,$(DEB_HOST_ARCH)),)
   TEST_FAIL_COMMAND = echo "Ignoring test failures on this architecture"
 else
   TEST_FAIL_COMMAND = exit 1
diff -pruN 287/t/090_multicluster.t 287ubuntu1/t/090_multicluster.t
--- 287/t/090_multicluster.t	2023-10-19 12:38:24.000000000 +0000
+++ 287ubuntu1/t/090_multicluster.t	2025-11-11 21:16:14.000000000 +0000
@@ -244,8 +244,11 @@ unlink '/etc/postgresql-common/pg_servic
 is ((system "pg_ctlcluster $MAJORS[0] old stop >/dev/null"), 0, "stopping cluster $old");
 PgCommon::set_conf_value $MAJORS[0], 'old', 'postgresql.conf', 'port', '5435';
 is ((system "pg_ctlcluster $MAJORS[0] old start >/dev/null"), 0, "restarting cluster $old");
-like_program_out 'postgres', 'pg_lsclusters -h | sort -k3', 0, qr/.*5434.*5435.*5440.*/s,
-    'port of first cluster was successfully changed';
+SKIP: {
+    skip "rust coreutils sort -k option regression. See LP: #2125504", 2;
+    like_program_out 'postgres', 'pg_lsclusters -h | sort -k3', 0, qr/.*5434.*5435.*5440.*/s,
+        'port of first cluster was successfully changed';
+}
 like_program_out 'postgres', "psql -l", 2,
     qr/no.*default.*man pg_wrapper.*psql:.*\.s\.PGSQL.5432/is,
     'proper pg_wrapper warning and psql error if no cluster is suitable as default target';