diff -pruN 1.31.1-4/debian/changelog 1.31.1-4ubuntu1/debian/changelog
--- 1.31.1-4/debian/changelog	2025-09-07 17:13:04.000000000 +0000
+++ 1.31.1-4ubuntu1/debian/changelog	2025-09-10 09:17:40.000000000 +0000
@@ -1,3 +1,10 @@
+gnustep-base (1.31.1-4ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - disable some tests failing in Ubuntu infra, but not locally
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 10 Sep 2025 11:17:40 +0200
+
 gnustep-base (1.31.1-4) unstable; urgency=medium
 
   * debian/patches/gcc-15.patch: New; cherry-pick upstream commit to fix
@@ -15,6 +22,19 @@ gnustep-base (1.31.1-4) unstable; urgenc
 
  -- Yavor Doganov <yavor@gnu.org>  Sun, 07 Sep 2025 20:13:04 +0300
 
+gnustep-base (1.31.1-3ubuntu2) questing; urgency=medium
+
+  * No-change rebuild for libxml2 soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 22 May 2025 10:24:42 +0200
+
+gnustep-base (1.31.1-3ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - disable some tests failing in Ubuntu infra, but not locally
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 02 May 2025 07:48:35 +0200
+
 gnustep-base (1.31.1-3) unstable; urgency=medium
 
   * debian/templates/control.m4 (libgnustep-base`'SOV_BASE) <Depends>: Add
@@ -126,6 +146,13 @@ gnustep-base (1.31.0-1) experimental; ur
 
  -- Yavor Doganov <yavor@gnu.org>  Thu, 13 Feb 2025 11:59:09 +0200
 
+gnustep-base (1.30.0-14ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - disable some tests failing in Ubuntu infra, but not locally
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 13 Feb 2025 07:02:14 +0100
+
 gnustep-base (1.30.0-14) unstable; urgency=medium
 
   * debian/templates/control.m4 (libgnustep-base-dev) <Breaks>: Add
@@ -224,6 +251,13 @@ gnustep-base (1.30.0-10) experimental; u
 
  -- Yavor Doganov <yavor@gnu.org>  Sat, 25 Jan 2025 08:14:30 +0200
 
+gnustep-base (1.30.0-9ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - disable some tests failing in Ubuntu infra, but not locally
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 21 Jan 2025 21:35:11 +0100
+
 gnustep-base (1.30.0-9) unstable; urgency=medium
 
   * debian/patches/no-etc-timezone.patch: New; fix innocent bug in
@@ -249,6 +283,19 @@ gnustep-base (1.30.0-9) unstable; urgenc
 
  -- Yavor Doganov <yavor@gnu.org>  Sat, 18 Jan 2025 09:45:12 +0200
 
+gnustep-base (1.30.0-8ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild for icu soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 06 Jan 2025 05:30:52 +0100
+
+gnustep-base (1.30.0-8ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - disable some tests failing in Ubuntu infra, but not locally
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 30 Oct 2024 19:43:28 +0100
+
 gnustep-base (1.30.0-8) unstable; urgency=medium
 
   * debian/patches/NSCalendarDate-tests-tzdata-2024b.patch: New; adapt to
@@ -259,6 +306,13 @@ gnustep-base (1.30.0-8) unstable; urgenc
 
  -- Yavor Doganov <yavor@gnu.org>  Mon, 07 Oct 2024 16:36:02 +0300
 
+gnustep-base (1.30.0-7ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - disable some tests failing in Ubuntu infra, but not locally
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 16 Aug 2024 15:09:26 +0200
+
 gnustep-base (1.30.0-7) unstable; urgency=medium
 
   * debian/patches/NSStream-test-riscv64.patch: Revert last change.  Fix
@@ -316,6 +370,13 @@ gnustep-base (1.30.0-5) unstable; urgenc
 
  -- Yavor Doganov <yavor@gnu.org>  Sun, 11 Aug 2024 11:58:00 +0300
 
+gnustep-base (1.30.0-4ubuntu1) oracular; urgency=low
+
+  * Merge with Debian unstable. Remaining changes:
+    - disable some tests failing in Ubuntu infra, but not locally
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 05 Jul 2024 00:03:08 +0200
+
 gnustep-base (1.30.0-4) unstable; urgency=medium
 
   * debian/patches/hurd-tests.patch: Add two more testHopeful definitions
@@ -385,6 +446,40 @@ gnustep-base (1.30.0-1) experimental; ur
 
  -- Yavor Doganov <yavor@gnu.org>  Sat, 01 Jun 2024 20:14:25 +0300
 
+gnustep-base (1.29.0-7ubuntu4) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 06:17:07 +0000
+
+gnustep-base (1.29.0-7ubuntu3) noble; urgency=medium
+
+  * No-change rebuild against libgnutls30t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 10 Mar 2024 02:05:31 +0000
+
+gnustep-base (1.29.0-7ubuntu2) noble; urgency=medium
+
+  * No-change rebuild for ICU soname change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 19 Dec 2023 12:00:04 +0100
+
+gnustep-base (1.29.0-7ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2045024). Remaining changes:
+    - disable some tests failing in Ubuntu infra, but not locally
+  * Dropped changes, included in Debian:
+    - debian/templates/control.m4 (Build-Depends): Replace tzdata with
+      tzdata-legacy; fixes FTBFS and autopkgtest failure with recent tzdata
+      (Closes: #1050528).  Thanks Paul Gevers for the report.
+      (gnustep-base-common) <Depends>: Likewise.  This has the unfortunate
+      effect of pulling in tzdata-legacy on practically every GNUstep
+      installation but it's necessary so that methods like NSTimeZone
+      +timeZoneWithAbbreviation: continue to work.
+    - debian/control: Regenerate.
+
+ -- Ravi Kant Sharma <ravi.kant.sharma@canonical.com>  Wed, 29 Nov 2023 13:30:05 +0100
+
 gnustep-base (1.29.0-7) unstable; urgency=medium
 
   * debian/templates/control.m4 (Build-Depends): Replace tzdata with
@@ -405,6 +500,28 @@ gnustep-base (1.29.0-7) unstable; urgenc
 
  -- Yavor Doganov <yavor@gnu.org>  Wed, 27 Sep 2023 07:41:50 +0300
 
+gnustep-base (1.29.0-6ubuntu2) mantic; urgency=medium
+
+  [ Yavor Doganov ]
+
+  * debian/templates/control.m4 (Build-Depends): Replace tzdata with
+    tzdata-legacy; fixes FTBFS and autopkgtest failure with recent tzdata
+    (Closes: #1050528).  Thanks Paul Gevers for the report.
+    (gnustep-base-common) <Depends>: Likewise.  This has the unfortunate
+    effect of pulling in tzdata-legacy on practically every GNUstep
+    installation but it's necessary so that methods like NSTimeZone
+    +timeZoneWithAbbreviation: continue to work.
+  * debian/control: Regenerate.
+
+ -- Mate Kukri <mate.kukri@canonical.com>  Wed, 06 Sep 2023 14:15:57 +0100
+
+gnustep-base (1.29.0-6ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - disable some tests failing in Ubuntu infra, but not locally
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 03 Aug 2023 14:33:49 +0200
+
 gnustep-base (1.29.0-6) unstable; urgency=medium
 
   * debian/patches/hurd-nsurlconnection.patch: Delete; issue gone somehow.
@@ -417,6 +534,13 @@ gnustep-base (1.29.0-6) unstable; urgenc
 
  -- Yavor Doganov <yavor@gnu.org>  Wed, 02 Aug 2023 17:39:40 +0300
 
+gnustep-base (1.29.0-5ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - disable some tests failing in Ubuntu infra, but not locally
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 31 Jul 2023 08:56:04 +0200
+
 gnustep-base (1.29.0-5) unstable; urgency=medium
 
   * debian/patches/tmp-test-fix.patch: Remove and replace with new patches
@@ -457,6 +581,18 @@ gnustep-base (1.29.0-5) unstable; urgenc
 
  -- Yavor Doganov <yavor@gnu.org>  Sun, 30 Jul 2023 19:37:39 +0300
 
+gnustep-base (1.29.0-4ubuntu2) mantic; urgency=medium
+
+  * Revert previous upload, disable failing tests instead
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 05 Jul 2023 16:38:58 +0200
+
+gnustep-base (1.29.0-4ubuntu1) mantic; urgency=medium
+
+  * Increase timeouts again, they don't fail locally and in Debian
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 05 Jul 2023 16:09:40 +0200
+
 gnustep-base (1.29.0-4) unstable; urgency=medium
 
   * Upload to unstable.
diff -pruN 1.31.1-4/debian/tests/testsuite 1.31.1-4ubuntu1/debian/tests/testsuite
--- 1.31.1-4/debian/tests/testsuite	2025-01-29 12:02:44.000000000 +0000
+++ 1.31.1-4ubuntu1/debian/tests/testsuite	2025-09-09 09:56:29.000000000 +0000
@@ -3,6 +3,10 @@
 set -e
 set -u
 
+rm -rf Tests/base/NSURL/test00.m
+rm -rf Tests/base/NSURL/test01.m
+rm -rf Tests/base/NSURLHandle/test01.m
+
 export GNUSTEP_MAKEFILES=/usr/share/GNUstep/Makefiles
 
 # Some tests require config.mak and GSConfig.h.
