diff -pruN 1:2.3.5+ds-2/debian/.gitignore 1:2.3.5+ds-2ubuntu1/debian/.gitignore
--- 1:2.3.5+ds-2/debian/.gitignore	2025-11-20 21:28:54.000000000 +0000
+++ 1:2.3.5+ds-2ubuntu1/debian/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# Upstream ignores files which we want to track in the debian folder
-!*
diff -pruN 1:2.3.5+ds-2/debian/changelog 1:2.3.5+ds-2ubuntu1/debian/changelog
--- 1:2.3.5+ds-2/debian/changelog	2025-11-20 21:28:54.000000000 +0000
+++ 1:2.3.5+ds-2ubuntu1/debian/changelog	2025-12-07 21:48:55.000000000 +0000
@@ -1,3 +1,10 @@
+numpy (1:2.3.5+ds-2ubuntu1) resolute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Skip test_cpu_features on ppc64el and s390x
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 07 Dec 2025 22:48:55 +0100
+
 numpy (1:2.3.5+ds-2) unstable; urgency=medium
 
   * Also fix integer size for new flags type
@@ -18,6 +25,13 @@ numpy (1:2.3.5+ds-1) unstable; urgency=m
 
  -- Timo Röhling <roehling@debian.org>  Thu, 20 Nov 2025 09:47:17 +0100
 
+numpy (1:2.3.4+ds-3ubuntu1) resolute; urgency=medium
+
+  * Merge from Debian unstable (LP: #2130177), remaining changes:
+    - Skip test_cpu_features on ppc64el and s390x
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Thu, 13 Nov 2025 18:32:17 +0000
+
 numpy (1:2.3.4+ds-3) unstable; urgency=medium
 
   * Fix compatibility with SWIG >= 4.4.
@@ -43,6 +57,12 @@ numpy (1:2.3.4+ds-1) unstable; urgency=m
 
  -- Timo Röhling <roehling@debian.org>  Tue, 28 Oct 2025 10:40:01 +0100
 
+numpy (1:2.3.3+ds-3ubuntu1) resolute; urgency=medium
+
+  * Skip test_cpu_features on ppc64el and s390x (LP: #2127939)
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Sat, 18 Oct 2025 14:38:40 +0000
+
 numpy (1:2.3.3+ds-3) unstable; urgency=medium
 
   * Reproducible Builds fix
@@ -95,6 +115,14 @@ numpy (1:2.2.4+ds-1.1) unstable; urgency
 
  -- Matthias Klose <doko@debian.org>  Thu, 04 Sep 2025 16:17:01 +0200
 
+numpy (1:2.2.4+ds-1ubuntu1) questing; urgency=medium
+
+  * Rebuild for IEEE long double on ppc64el
+  * Skip test_linear_interpolation_formula_symmetric and
+    test_ppc64_ibm_double_double128 on ppc64el
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Sun, 01 Jun 2025 12:18:42 +0000
+
 numpy (1:2.2.4+ds-1) unstable; urgency=medium
 
   * New upstream version 2.2.4+ds
@@ -2371,4 +2399,3 @@ python-numpy (0.9.4-1) unstable; urgency
   * Initial release Closes.
 
  -- Marco Presi (Zufus) <zufus@debian.org>  Tue, 14 Feb 2006 00:40:53 +0100
-
diff -pruN 1:2.3.5+ds-2/debian/control 1:2.3.5+ds-2ubuntu1/debian/control
--- 1:2.3.5+ds-2/debian/control	2025-11-20 21:28:54.000000000 +0000
+++ 1:2.3.5+ds-2ubuntu1/debian/control	2025-11-21 04:25:01.000000000 +0000
@@ -1,7 +1,8 @@
 Source: numpy
 Section: python
 Priority: optional
-Maintainer: Debian Python Team <team+python@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Team <team+python@tracker.debian.org>
 Uploaders:
  Christian Kastner <ckk@debian.org>,
  Timo Röhling <roehling@debian.org>,
diff -pruN 1:2.3.5+ds-2/debian/rules 1:2.3.5+ds-2ubuntu1/debian/rules
--- 1:2.3.5+ds-2/debian/rules	2025-11-20 21:28:54.000000000 +0000
+++ 1:2.3.5+ds-2ubuntu1/debian/rules	2025-12-07 21:48:22.000000000 +0000
@@ -65,6 +65,7 @@ SKIP_TESTS += \
 endif
 ifneq ($(filter ppc64el,$(DEB_HOST_ARCH)),)
 SKIP_TESTS += \
+	test_cpu_features \
 	test_ppc64_ibm_double_double128 \
 	test_linear_interpolation_formula_symmetric
 endif
@@ -72,6 +73,10 @@ ifneq ($(filter riscv64,$(DEB_HOST_ARCH)
 SKIP_TESTS += \
 	test_unary_spurious_fpexception
 endif
+ifneq ($(filter s390x,$(DEB_HOST_ARCH)),)
+SKIP_TESTS += \
+	test_cpu_features
+endif
 ifeq ($(PYBUILD_AUTOPKGTEST),1)
 SKIP_TESTS += test_dict_mode
 endif