diff -pruN 3.1.6+dfsg-1/debian/.gitignore 3.1.6+dfsg-1ubuntu1/debian/.gitignore
--- 3.1.6+dfsg-1/debian/.gitignore	2025-10-25 21:17:28.000000000 +0000
+++ 3.1.6+dfsg-1ubuntu1/debian/.gitignore	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-!*.patch
-/files
diff -pruN 3.1.6+dfsg-1/debian/changelog 3.1.6+dfsg-1ubuntu1/debian/changelog
--- 3.1.6+dfsg-1/debian/changelog	2025-10-25 21:17:28.000000000 +0000
+++ 3.1.6+dfsg-1ubuntu1/debian/changelog	2025-10-26 05:40:04.000000000 +0000
@@ -1,3 +1,10 @@
+cython (3.1.6+dfsg-1ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Drop python-numpy build-dependencies on i386
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 26 Oct 2025 06:40:04 +0100
+
 cython (3.1.6+dfsg-1) experimental; urgency=medium
 
   * Team upload.
@@ -13,6 +20,40 @@ cython (3.1.6+dfsg-1) experimental; urge
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 25 Oct 2025 22:17:28 +0100
 
+cython (3.0.11+dfsg-2ubuntu5) resolute; urgency=medium
+
+  * Restore <!nocheck> build-dependencies, this resulted in
+    many dependency-level changes in the transition tracker
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Mon, 20 Oct 2025 08:51:58 +0000
+
+cython (3.0.11+dfsg-2ubuntu4) resolute; urgency=medium
+
+  * Drop <!nocheck> build-dependencies except
+    python3-setuptools, see #1116724
+  * Disable build-time tests for first build with Python 3.14
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Sun, 19 Oct 2025 14:09:32 +0000
+
+cython (3.0.11+dfsg-2ubuntu3) resolute; urgency=medium
+
+  * No-change rebuild with Python 3.14 as supported version
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Sun, 19 Oct 2025 12:09:55 +0000
+
+cython (3.0.11+dfsg-2ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild with Python 3.13 only
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Tue, 04 Mar 2025 19:52:31 +0000
+
+cython (3.0.11+dfsg-2ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Drop python-numpy build-dependencies on i386
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Tue, 11 Feb 2025 12:55:20 +0000
+
 cython (3.0.11+dfsg-2) unstable; urgency=medium
 
   * Team upload.
@@ -20,6 +61,19 @@ cython (3.0.11+dfsg-2) unstable; urgency
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 09 Feb 2025 17:55:27 +0000
 
+cython (3.0.11+dfsg-1ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild to add support for Python 3.13.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 14 Nov 2024 10:53:48 +0100
+
+cython (3.0.11+dfsg-1ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Drop python-numpy build-dependencies on i386
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 21 Aug 2024 12:41:24 +0200
+
 cython (3.0.11+dfsg-1) unstable; urgency=medium
 
   * Team upload
@@ -31,6 +85,13 @@ cython (3.0.11+dfsg-1) unstable; urgency
 
  -- Stefano Rivera <stefanor@debian.org>  Tue, 20 Aug 2024 23:23:20 +0200
 
+cython (3.0.10+dfsg-5ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Drop python-numpy build-dependencies on i386
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Mon, 06 May 2024 15:46:52 +0000
+
 cython (3.0.10+dfsg-5) unstable; urgency=medium
 
   * Team upload
@@ -84,6 +145,25 @@ cython (3.0.10+dfsg-1) unstable; urgency
 
  -- Julian Gilbey <jdg@debian.org>  Wed, 17 Apr 2024 22:17:50 +0100
 
+cython (3.0.8-1ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- William Grant <wgrant@ubuntu.com>  Mon, 01 Apr 2024 16:45:06 +1100
+
+cython (3.0.8-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild to build with python3.12 only.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 16 Mar 2024 23:15:20 +0100
+
+cython (3.0.8-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Drop python-numpy build-dependencies on i386
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 22 Jan 2024 12:55:48 +0100
+
 cython (3.0.8-1) unstable; urgency=medium
 
   * Team upload.
@@ -92,6 +172,13 @@ cython (3.0.8-1) unstable; urgency=mediu
 
  -- Stefano Rivera <stefanor@debian.org>  Sun, 21 Jan 2024 14:14:12 -0400
 
+cython (3.0.7-2ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Drop python-numpy build-dependencies on i386
+
+ -- Stefano Rivera <stefanor@ubuntu.com>  Sat, 30 Dec 2023 11:42:37 -0400
+
 cython (3.0.7-2) unstable; urgency=medium
 
   * Team upload.
@@ -148,6 +235,43 @@ cython (3.0.5-1) experimental; urgency=m
 
  -- Stefano Rivera <stefanor@debian.org>  Thu, 23 Nov 2023 18:01:46 +0000
 
+cython (0.29.36-3.1ubuntu2) noble; urgency=medium
+
+  * Merge with Debian; remainig changes:
+    - Drop python-numpy build-dependencies on i386
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 11 Dec 2023 08:17:01 +0100
+
+cython (0.29.36-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Avoid using the thread state attribute "use_tracing" in Python 3.12.
+    Patch taken from upstream. "however, that doesn't mean that
+    profiling/tracing now works in Py3.12".
+
+ -- Matthias Klose <doko@debian.org>  Sun, 10 Dec 2023 00:06:47 +0100
+
+cython (0.29.36-3ubuntu1) noble; urgency=medium
+
+  * Merge with Debian; remainig changes:
+    - Drop python-numpy build-dependencies on i386
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 26 Nov 2023 13:31:59 +0100
+
+cython (0.29.36-3) unstable; urgency=medium
+
+  * Team upload.
+  * cython3: Breaks + Replaces cython3-dbg. (Closes: #1056627)
+
+ -- Stefano Rivera <stefanor@debian.org>  Fri, 24 Nov 2023 13:44:02 +0000
+
+cython (0.29.36-2ubuntu1) noble; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Drop python-numpy build-dependencies on i386
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 23 Nov 2023 22:46:36 +0100
+
 cython (0.29.36-2) unstable; urgency=medium
 
   * Team upload.
@@ -161,6 +285,19 @@ cython (0.29.36-2) unstable; urgency=med
 
  -- Stefano Rivera <stefanor@debian.org>  Thu, 23 Nov 2023 14:32:11 +0000
 
+cython (0.29.36-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild to build with python3.12 as supported.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 01 Nov 2023 19:01:40 +0100
+
+cython (0.29.36-1ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    - Drop python-numpy build-dependencies on i386
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 08 Jul 2023 13:16:19 +0200
+
 cython (0.29.36-1) unstable; urgency=medium
 
   * Team upload.
@@ -171,6 +308,19 @@ cython (0.29.36-1) unstable; urgency=med
 
  -- Stefano Rivera <stefanor@debian.org>  Fri, 07 Jul 2023 10:05:47 -0400
 
+cython (0.29.32-2ubuntu2) lunar; urgency=medium
+
+  * Rebuild to drop Python 3.10 extension
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Wed, 01 Mar 2023 14:46:27 -0500
+
+cython (0.29.32-2ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    + Drop python-numpy build-dependencies on i386
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Thu, 01 Dec 2022 15:18:53 +0000
+
 cython (0.29.32-2) unstable; urgency=medium
 
   * Team upload.
@@ -179,6 +329,13 @@ cython (0.29.32-2) unstable; urgency=med
 
  -- Stefano Rivera <stefanor@debian.org>  Wed, 23 Nov 2022 19:59:12 +0200
 
+cython (0.29.32-1ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian unstable (LP: #1995992), remaining changes:
+    + Drop python-numpy build-dependencies on i386
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Mon, 14 Nov 2022 12:08:12 +0000
+
 cython (0.29.32-1) unstable; urgency=medium
 
   * Team upload.
@@ -186,6 +343,19 @@ cython (0.29.32-1) unstable; urgency=med
 
  -- Boyuan Yang <byang@debian.org>  Wed, 14 Sep 2022 14:31:42 -0400
 
+cython (0.29.30-1ubuntu2) lunar; urgency=medium
+
+  * No-change rebuild with Python 3.11 as supported
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Thu, 03 Nov 2022 06:27:33 +0000
+
+cython (0.29.30-1ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    + Drop python-numpy build-dependencies on i386
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Tue, 14 Jun 2022 15:02:41 +0000
+
 cython (0.29.30-1) unstable; urgency=medium
 
   * Team upload.
@@ -210,6 +380,25 @@ cython (0.29.28-2) unstable; urgency=med
 
  -- Stefano Rivera <stefanor@debian.org>  Thu, 17 Mar 2022 14:29:17 -0400
 
+cython (0.29.28-1ubuntu3) jammy; urgency=medium
+
+  * Fix cython3-dbg installation for Python 3.10
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Thu, 17 Mar 2022 19:07:30 +0000
+
+cython (0.29.28-1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild with Python 3.10 only
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Wed, 16 Mar 2022 23:48:27 +0000
+
+cython (0.29.28-1ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    + Drop python-numpy build-dependencies on i386
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Wed, 23 Feb 2022 18:12:26 +0000
+
 cython (0.29.28-1) unstable; urgency=medium
 
   * Team upload
@@ -226,6 +415,13 @@ cython (0.29.28-1) unstable; urgency=med
 
  -- Graham Inggs <ginggs@debian.org>  Wed, 23 Feb 2022 12:31:37 +0000
 
+cython (0.29.24-2ubuntu1) jammy; urgency=medium
+
+  * Merge from Debian unstable, remaining changes:
+    + Drop python-numpy build-dependencies on i386
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Tue, 28 Dec 2021 15:12:42 +0000
+
 cython (0.29.24-2) unstable; urgency=medium
 
   * Team upload.
@@ -252,6 +448,34 @@ cython (0.29.24-1) unstable; urgency=med
 
  -- Sandro Tosi <morph@debian.org>  Wed, 20 Oct 2021 22:41:55 -0400
 
+cython (0.29.24-0ubuntu3) jammy; urgency=medium
+
+  * Fix compatibility with Sphinx 4.2.0
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Wed, 20 Oct 2021 08:00:23 +0000
+
+cython (0.29.24-0ubuntu2) jammy; urgency=medium
+
+  * Replace remaining changes after merge:
+    + Drop python-numpy build-dependencies on i386
+    + Drop numpy b-d for a first build with 3.10
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Tue, 19 Oct 2021 11:55:50 +0000
+
+cython (0.29.24-0ubuntu1) jammy; urgency=medium
+
+  [ Debian Janitor ]
+  * Apply multi-arch hints.
+    + cython3-dbg: Add Multi-Arch: same.
+
+  [ Sandro Tosi ]
+  * New upstream release; Closes: #991946
+
+  [ Graham Inggs ]
+  * Refresh debian/patches/deb_nopngmath
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Tue, 19 Oct 2021 07:31:26 +0000
+
 cython (0.29.21-3) unstable; urgency=medium
 
   * Team upload
@@ -275,6 +499,31 @@ cython (0.29.21-2) unstable; urgency=med
 
  -- Graham Inggs <ginggs@debian.org>  Wed, 14 Oct 2020 09:52:40 +0000
 
+cython (0.29.21-1ubuntu4) jammy; urgency=medium
+
+  * No-change rebuild to add python3.10.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 16 Oct 2021 06:56:13 +0000
+
+cython (0.29.21-1ubuntu3) hirsute; urgency=medium
+
+  * No-change rebuild to drop python3.8 extensions.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 07 Dec 2020 18:19:50 +0100
+
+cython (0.29.21-1ubuntu2) hirsute; urgency=medium
+
+  * Drop nump b-d for a first build with 3.9.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 24 Oct 2020 18:56:26 +0200
+
+cython (0.29.21-1ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Drop python-numpy build-dependencies on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 04 Aug 2020 16:03:09 +0200
+
 cython (0.29.21-1) unstable; urgency=medium
 
   * New upstream release; Closes: #963084
@@ -1051,3 +1300,4 @@ cython (0.9.6.8.ds-1) unstable; urgency=
     - added missing file
 
  -- Ondrej Certik <ondrej@certik.cz>  Fri, 30 Nov 2007 13:00:44 +0100
+
diff -pruN 3.1.6+dfsg-1/debian/control 3.1.6+dfsg-1ubuntu1/debian/control
--- 3.1.6+dfsg-1/debian/control	2025-10-25 21:17:28.000000000 +0000
+++ 3.1.6+dfsg-1ubuntu1/debian/control	2025-10-26 05:40:04.000000000 +0000
@@ -1,7 +1,8 @@
 Source: cython
 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: Ondrej Certik <ondrej@certik.cz>,
            Yaroslav Halchenko <debian@onerussian.com>
 Build-Depends: debhelper-compat (= 13),
@@ -9,7 +10,7 @@ Build-Depends: debhelper-compat (= 13),
                gdb <!nocheck>,
                help2man,
                python3-all-dev,
-               python3-numpy <!nocheck>,
+               python3-numpy [!i386] <!nocheck>,
                python3-setuptools,
 Build-Depends-Indep: dh-sequence-sphinxdoc,
                      python3-sphinx,
diff -pruN 3.1.6+dfsg-1/debian/rules 3.1.6+dfsg-1ubuntu1/debian/rules
--- 3.1.6+dfsg-1/debian/rules	2025-10-25 21:17:28.000000000 +0000
+++ 3.1.6+dfsg-1ubuntu1/debian/rules	2025-10-26 05:40:04.000000000 +0000
@@ -43,21 +43,21 @@ override_dh_installchangelogs:
 	dh_installchangelogs --all CHANGES.rst
 
 override_dh_auto_test-arch:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))$(filter sparc64,$(DEB_HOST_ARCH)))
-	set -e; for P in $(PY3VERS); do \
-	 echo =============== $$P start ===============; \
-	 if PYTHONPATH=`/bin/ls -d $(CURDIR)/build/lib.*-$$P` \
-	  /usr/bin/python$$P runtests.py $(RUNTESTSOPTS) \
-            --no-refnanny -v -v \
-	    --exclude="(parallel|Debugger|annotate_html|numpy_test|subinterpreters_threading_stress_test)" \
-	    --work-dir=build/work-dir 2>&1; \
-	 then \
-	   echo =============== $$P done ===============; \
-	 else \
-	   echo "=============== $$P done (FAILURES IGNORED) ==============="; \
-	 fi; \
-	done
-endif
+#ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))$(filter sparc64,$(DEB_HOST_ARCH)))
+#	set -e; for P in $(PY3VERS); do \
+#	 echo =============== $$P start ===============; \
+#	 if PYTHONPATH=`/bin/ls -d $(CURDIR)/build/lib.*-$$P` \
+#	  /usr/bin/python$$P runtests.py $(RUNTESTSOPTS) \
+#           --no-refnanny -v -v \
+#	    --exclude="(parallel|Debugger|annotate_html|numpy_test|subinterpreters_threading_stress_test)" \
+#	    --work-dir=build/work-dir 2>&1; \
+#	 then \
+#	   echo =============== $$P done ===============; \
+#	 else \
+#	   echo "=============== $$P done (FAILURES IGNORED) ==============="; \
+#	 fi; \
+#	done
+#endif
 
 override_dh_auto_test-indep:
 	# no tests
