diff -pruN 1.42.9-1/debian/changelog 1.42.9-1ubuntu1/debian/changelog
--- 1.42.9-1/debian/changelog	2025-11-06 23:24:32.000000000 +0000
+++ 1.42.9-1ubuntu1/debian/changelog	2025-11-07 08:45:51.000000000 +0000
@@ -1,3 +1,13 @@
+nbdkit (1.42.9-1ubuntu1) resolute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build 
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 07 Nov 2025 09:45:51 +0100
+
 nbdkit (1.42.9-1) unstable; urgency=medium
 
   * New upstream version 1.42.9
@@ -7,12 +17,32 @@ nbdkit (1.42.9-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Fri, 07 Nov 2025 00:24:32 +0100
 
+nbdkit (1.42.6-1ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Aug 2025 13:49:51 +0200
+
 nbdkit (1.42.6-1) unstable; urgency=medium
 
   * New upstream version 1.42.6
 
  -- Hilko Bengen <bengen@debian.org>  Tue, 29 Jul 2025 21:21:44 +0200
 
+nbdkit (1.42.4-1ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 16 Jun 2025 10:15:26 +0200
+
 nbdkit (1.42.4-1) unstable; urgency=medium
 
   * New upstream version 1.42.4
@@ -20,12 +50,32 @@ nbdkit (1.42.4-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Sun, 15 Jun 2025 18:19:36 +0200
 
+nbdkit (1.42.3-1ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 26 May 2025 13:59:51 +0200
+
 nbdkit (1.42.3-1) unstable; urgency=medium
 
   * New upstream version 1.42.3
 
  -- Hilko Bengen <bengen@debian.org>  Sun, 25 May 2025 14:48:44 +0200
 
+nbdkit (1.42.2-1ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 02 Apr 2025 16:53:37 +0200
+
 nbdkit (1.42.2-1) unstable; urgency=medium
 
   * New upstream version 1.42.2
@@ -34,6 +84,16 @@ nbdkit (1.42.2-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Tue, 01 Apr 2025 10:35:05 +0200
 
+nbdkit (1.42.1-1ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 24 Mar 2025 08:12:59 +0100
+
 nbdkit (1.42.1-1) unstable; urgency=medium
 
   * New upstream version 1.42.1
@@ -41,6 +101,16 @@ nbdkit (1.42.1-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Wed, 05 Mar 2025 00:11:13 +0100
 
+nbdkit (1.42.0-1ubuntu1) plucky; urgency=medium
+
+  * Merge from Debian Unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 19 Feb 2025 19:03:42 -0600
+
 nbdkit (1.42.0-1) unstable; urgency=medium
 
   * New upstream version 1.42.0
@@ -48,12 +118,38 @@ nbdkit (1.42.0-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Thu, 13 Feb 2025 12:19:51 +0100
 
+nbdkit (1.40.5-1ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 13 Feb 2025 07:03:18 +0100
+
 nbdkit (1.40.5-1) unstable; urgency=medium
 
   * New upstream version 1.40.5
 
  -- Hilko Bengen <bengen@debian.org>  Wed, 12 Feb 2025 21:38:11 +0100
 
+nbdkit (1.40.4-11ubuntu3) plucky; urgency=medium
+
+  * No-change rebuild for Python 3.13 as the default.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 04 Jan 2025 05:18:57 +0100
+
+nbdkit (1.40.4-11ubuntu2) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 22 Dec 2024 18:52:01 +0100
+
 nbdkit (1.40.4-11) unstable; urgency=medium
 
   * Limit blkio to 64 bit architectures
@@ -66,6 +162,34 @@ nbdkit (1.40.4-10) unstable; urgency=med
 
  -- Hilko Bengen <bengen@debian.org>  Fri, 20 Dec 2024 10:13:43 +0100
 
+nbdkit (1.40.4-9ubuntu4) plucky; urgency=medium
+
+  * Ignore some more new tests failing
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 20 Dec 2024 16:12:53 +0100
+
+nbdkit (1.40.4-9ubuntu3) plucky; urgency=medium
+
+  * Try to ignore blkio plugin on armhf
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 20 Dec 2024 15:37:20 +0100
+
+nbdkit (1.40.4-9ubuntu2) plucky; urgency=medium
+
+  * Fix blkio plugin install path
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 20 Dec 2024 15:30:19 +0100
+
+nbdkit (1.40.4-9ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 20 Dec 2024 15:28:25 +0100
+
 nbdkit (1.40.4-9) unstable; urgency=medium
 
   * Fix nbdkit.install
@@ -86,6 +210,16 @@ nbdkit (1.40.4-7) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Wed, 18 Dec 2024 22:06:58 +0100
 
+nbdkit (1.40.4-6ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 13 Dec 2024 21:23:25 +0100
+
 nbdkit (1.40.4-6) unstable; urgency=medium
 
   * Add patch to fix glibc 2.40 crash on mips64el.
@@ -94,6 +228,16 @@ nbdkit (1.40.4-6) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Fri, 13 Dec 2024 01:18:28 +0100
 
+nbdkit (1.40.4-5ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 30 Nov 2024 10:03:50 +0100
+
 nbdkit (1.40.4-5) unstable; urgency=medium
 
   * Disable luks-related tests (Closes: #1088358)
@@ -106,6 +250,16 @@ nbdkit (1.40.4-4) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Tue, 26 Nov 2024 13:51:00 +0100
 
+nbdkit (1.40.4-3ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 24 Nov 2024 10:46:24 +0100
+
 nbdkit (1.40.4-3) unstable; urgency=medium
 
   * Remove libguestfs-tools dependency for i386, armhf
@@ -118,12 +272,38 @@ nbdkit (1.40.4-2) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Sun, 24 Nov 2024 00:44:27 +0100
 
+nbdkit (1.40.4-1ubuntu2) plucky; urgency=medium
+
+  * No-change rebuild for libperl soname.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 20 Oct 2024 14:32:50 +0200
+
+nbdkit (1.40.4-1ubuntu1) oracular; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 29 Sep 2024 09:05:54 +0200
+
 nbdkit (1.40.4-1) unstable; urgency=medium
 
   * New upstream version 1.40.4
 
  -- Hilko Bengen <bengen@debian.org>  Sat, 28 Sep 2024 13:01:50 +0200
 
+nbdkit (1.40.3-1ubuntu1) oracular; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 16 Sep 2024 14:09:05 +0200
+
 nbdkit (1.40.3-1) unstable; urgency=medium
 
   * New upstream version 1.40.3
@@ -144,6 +324,16 @@ nbdkit (1.40.2-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Sun, 25 Aug 2024 13:03:16 +0200
 
+nbdkit (1.40.0-1ubuntu2) oracular; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 06 Aug 2024 21:10:58 +0200
+
 nbdkit (1.40.0-1) unstable; urgency=medium
 
   * New upstream version 1.40.0
@@ -152,12 +342,32 @@ nbdkit (1.40.0-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Mon, 22 Jul 2024 17:50:21 +0200
 
+nbdkit (1.38.3-1ubuntu1) oracular; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 22 Jul 2024 20:43:32 +0200
+
 nbdkit (1.38.3-1) unstable; urgency=medium
 
   * New upstream version 1.38.3
 
  -- Hilko Bengen <bengen@debian.org>  Mon, 22 Jul 2024 11:49:16 +0200
 
+nbdkit (1.38.2-2ubuntu3) oracular; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build
+      - 0008-skip-test-file-block-without-losetup.patch
+      - 0009-skip-tests-failing-in-build-env.patchenvironment
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 19 Jul 2024 11:06:06 +0200
+
 nbdkit (1.38.2-2) unstable; urgency=medium
 
   * Allow -rpi kernel to be used for running tests on armel (Closes: #1070769)
@@ -189,6 +399,70 @@ nbdkit (1.38.0-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Fri, 05 Apr 2024 14:51:42 +0200
 
+nbdkit (1.36.3-1ubuntu10) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 20:11:56 +0000
+
+nbdkit (1.36.3-1ubuntu9) noble; urgency=high
+
+  * No change rebuild against libcurl3t64-gnutls.
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 22 Mar 2024 18:18:16 +0100
+
+nbdkit (1.36.3-1ubuntu8) noble; urgency=medium
+
+  * Rebuild against new libguestfs t64.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 15 Mar 2024 19:24:58 +0100
+
+nbdkit (1.36.3-1ubuntu7) noble; urgency=medium
+
+  * No-change rebuild against libcom-err2
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 12 Mar 2024 20:33:51 +0000
+
+nbdkit (1.36.3-1ubuntu6) noble; urgency=medium
+
+  * No-change rebuild against libperl5.38t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 09 Mar 2024 18:21:36 +0000
+
+nbdkit (1.36.3-1ubuntu5) noble; urgency=medium
+
+  * No-change rebuild against libssl3t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 04 Mar 2024 20:07:00 +0000
+
+nbdkit (1.36.3-1ubuntu4) noble; urgency=medium
+
+  * No-change rebuild for python3.12 t64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 02 Mar 2024 21:13:15 +0100
+
+nbdkit (1.36.3-1ubuntu3) noble; urgency=medium
+
+  * No-change upload to remove support of ruby3.1.
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Tue, 20 Feb 2024 18:18:24 -0300
+
+nbdkit (1.36.3-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild with Python 3.12 as default
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Sat, 20 Jan 2024 18:17:22 +0000
+
+nbdkit (1.36.3-1ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 18 Jan 2024 12:43:10 +0100
+
 nbdkit (1.36.3-1) unstable; urgency=medium
 
   * New upstream version 1.36.3
@@ -196,12 +470,32 @@ nbdkit (1.36.3-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Wed, 17 Jan 2024 20:59:18 +0100
 
+nbdkit (1.36.2-1ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 28 Nov 2023 12:43:08 +0100
+
 nbdkit (1.36.2-1) unstable; urgency=medium
 
   * New upstream version 1.36.2
 
  -- Hilko Bengen <bengen@debian.org>  Mon, 27 Nov 2023 21:44:34 +0100
 
+nbdkit (1.36.1-1ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 26 Oct 2023 08:50:04 +0200
+
 nbdkit (1.36.1-1) unstable; urgency=medium
 
   * New upstream version 1.36.1
@@ -216,18 +510,48 @@ nbdkit (1.36.0-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Mon, 09 Oct 2023 08:25:05 +0200
 
+nbdkit (1.34.4-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 28 Sep 2023 08:57:45 +0200
+
 nbdkit (1.34.4-1) unstable; urgency=medium
 
   * New upstream version 1.34.4
 
  -- Hilko Bengen <bengen@debian.org>  Wed, 27 Sep 2023 10:23:14 +0200
 
+nbdkit (1.34.3-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 11 Sep 2023 11:19:58 +0200
+
 nbdkit (1.34.3-1) unstable; urgency=medium
 
   * New upstream version 1.34.3
 
  -- Hilko Bengen <bengen@debian.org>  Sun, 10 Sep 2023 18:22:41 +0200
 
+nbdkit (1.34.2-10ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 30 Jul 2023 07:26:12 +0200
+
 nbdkit (1.34.2-10) unstable; urgency=medium
 
   * Really skip test-stdio
@@ -246,18 +570,48 @@ nbdkit (1.34.2-8) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Fri, 28 Jul 2023 11:32:36 +0200
 
+nbdkit (1.34.2-7ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 28 Jul 2023 09:19:16 +0200
+
 nbdkit (1.34.2-7) unstable; urgency=medium
 
   * Disable gueestfs test again for for mips*, fix typo
 
  -- Hilko Bengen <bengen@debian.org>  Thu, 27 Jul 2023 21:53:07 +0200
 
+nbdkit (1.34.2-6ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 27 Jul 2023 08:01:27 +0200
+
 nbdkit (1.34.2-6) unstable; urgency=medium
 
   * Disable libguestfs tests on armel
 
  -- Hilko Bengen <bengen@debian.org>  Thu, 27 Jul 2023 01:17:36 +0200
 
+nbdkit (1.34.2-5ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 26 Jul 2023 08:26:12 +0200
+
 nbdkit (1.34.2-5) unstable; urgency=medium
 
   * Add kernel image dependencies for armel, mips*
@@ -265,12 +619,32 @@ nbdkit (1.34.2-5) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Tue, 25 Jul 2023 14:33:30 +0200
 
+nbdkit (1.34.2-4ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 23 Jul 2023 09:02:37 +0200
+
 nbdkit (1.34.2-4) unstable; urgency=medium
 
   * Set LIBGUESTFS_BACKEND_SETTINGS if kvm is not available
 
  -- Hilko Bengen <bengen@debian.org>  Sat, 22 Jul 2023 12:16:32 +0200
 
+nbdkit (1.34.2-3ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 21 Jul 2023 20:10:25 +0200
+
 nbdkit (1.34.2-3) unstable; urgency=medium
 
   * Require kernels for testing with libguestfs-tools
@@ -283,18 +657,48 @@ nbdkit (1.34.2-2) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Fri, 21 Jul 2023 14:14:12 +0200
 
+nbdkit (1.34.2-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 21 Jul 2023 07:53:48 +0200
+
 nbdkit (1.34.2-1) unstable; urgency=medium
 
   * New upstream version 1.34.2
 
  -- Hilko Bengen <bengen@debian.org>  Wed, 19 Jul 2023 23:52:40 +0200
 
+nbdkit (1.34.1-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 13 Jun 2023 08:34:34 +0200
+
 nbdkit (1.34.1-1) unstable; urgency=medium
 
   * New upstream version 1.34.1
 
  -- Hilko Bengen <bengen@debian.org>  Mon, 12 Jun 2023 18:22:30 +0200
 
+nbdkit (1.34.0-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 02 May 2023 09:00:25 +0200
+
 nbdkit (1.34.0-1) unstable; urgency=medium
 
   * New upstream version 1.34.0
@@ -303,12 +707,44 @@ nbdkit (1.34.0-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Sat, 15 Apr 2023 19:06:12 +0200
 
+nbdkit (1.32.5-1ubuntu2) lunar; urgency=medium
+
+  * No-change upload to remove support for ruby3.0.
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Fri, 03 Feb 2023 15:59:48 -0300
+
+nbdkit (1.32.5-1ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 17 Jan 2023 12:09:14 +0100
+
 nbdkit (1.32.5-1) unstable; urgency=medium
 
   * New upstream version 1.32.5
 
  -- Hilko Bengen <bengen@debian.org>  Wed, 04 Jan 2023 10:09:23 +0100
 
+nbdkit (1.32.4-1ubuntu3) lunar; urgency=medium
+
+  * No-change rebuild with Python 3.11 as default
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Mon, 26 Dec 2022 17:58:10 +0000
+
+nbdkit (1.32.4-1ubuntu2) lunar; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 16 Dec 2022 15:35:07 +0100
+
 nbdkit (1.32.4-1) unstable; urgency=medium
 
   * New upstream version 1.32.4
@@ -455,6 +891,40 @@ nbdkit (1.26.3-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Sun, 15 Aug 2021 10:59:36 +0200
 
+nbdkit (1.24.1-2ubuntu5) lunar; urgency=medium
+
+  * Rebuild against new perlapi-5.36.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 05 Nov 2022 09:22:26 +0100
+
+nbdkit (1.24.1-2ubuntu4) jammy; urgency=medium
+
+  * No-change rebuild for the perl update.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 06 Feb 2022 14:12:04 +0100
+
+nbdkit (1.24.1-2ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild with Python 3.10 as default version
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Thu, 13 Jan 2022 20:09:08 +0000
+
+nbdkit (1.24.1-2ubuntu2) jammy; urgency=medium
+
+  * No-change upload due to ruby3.0 transition, remove ruby2.7 support.
+
+ -- Lucas Kanashiro <kanashiro@ubuntu.com>  Sat, 04 Dec 2021 00:34:38 -0300
+
+nbdkit (1.24.1-2ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 05 Mar 2021 09:46:00 +0100
+
 nbdkit (1.24.1-2) unstable; urgency=medium
 
   * Re-enable torrent plugin (Closes: #983735)
@@ -500,6 +970,17 @@ nbdkit (1.24.0-1) unstable; urgency=medi
   
  -- Hilko Bengen <bengen@debian.org>  Sat, 09 Jan 2021 14:59:51 +0100
 
+nbdkit (1.22.4-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - omit tests failing in Ubuntu build environment
+      - d/p/0006-skip-test-file-block-without-losetup.patch
+      - d/p/0007-skip-tests-failing-in-build-env.patch
+      - d/control: don't depend on linux-* packages
+    - Build-depend on dh-python.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 23 Dec 2020 14:49:18 +0100
+
 nbdkit (1.22.4-1) unstable; urgency=medium
 
   * New upstream version 1.22.4
@@ -508,6 +989,17 @@ nbdkit (1.22.4-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Tue, 22 Dec 2020 14:46:40 +0100
 
+nbdkit (1.22.3-1.1ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+  * omit tests failing in Ubuntu build environment
+    - d/p/0006-skip-test-file-block-without-losetup.patch
+    - d/p/0007-skip-tests-failing-in-build-env.patch
+    - d/control: don't depend on linux-* packages
+    - Build-depend on dh-python.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 05 Dec 2020 14:15:18 +0100
+
 nbdkit (1.22.3-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -621,6 +1113,32 @@ nbdkit (1.18.0-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Fri, 28 Feb 2020 15:56:17 +0100
 
+nbdkit (1.16.2-1ubuntu3) focal; urgency=medium
+
+  [ Rafael David Tinoco ]
+  * Sponsoring ruby2.7 transitions
+
+  [ Lucas Kanashiro ]
+  * No-change rebuild for ruby2.7
+
+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com>  Mon, 02 Mar 2020 16:35:24 +0000
+
+nbdkit (1.16.2-1ubuntu2) focal; urgency=medium
+
+  * omit tests failing in Ubuntu build environment
+    - d/p/0004-skip-test-file-block-without-losetup.patch
+    - d/p/0005-skip-tests-failing-in-build-env.patch
+    - d/control: don't depend on linux-* packages
+
+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com>  Tue, 25 Feb 2020 11:06:19 +0100
+
+nbdkit (1.16.2-1ubuntu1) focal; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Build-depend on dh-python.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 21 Feb 2020 00:03:27 -0800
+
 nbdkit (1.16.2-1) unstable; urgency=medium
 
   * New upstream version 1.16.2
@@ -628,6 +1146,18 @@ nbdkit (1.16.2-1) unstable; urgency=medi
 
  -- Hilko Bengen <bengen@debian.org>  Wed, 29 Jan 2020 14:49:03 +0100
 
+nbdkit (1.16.1-3ubuntu1) focal; urgency=medium
+
+  * Build-depend on dh-python.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 28 Jan 2020 14:54:33 +0100
+
+nbdkit (1.16.1-3build1) focal; urgency=medium
+
+  * No-change rebuild to build with python3.8.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 25 Jan 2020 04:37:32 +0000
+
 nbdkit (1.16.1-3) unstable; urgency=medium
 
   * Re-add libnbd-dev build-dependency
diff -pruN 1.42.9-1/debian/control 1.42.9-1ubuntu1/debian/control
--- 1.42.9-1/debian/control	2025-05-25 12:48:13.000000000 +0000
+++ 1.42.9-1ubuntu1/debian/control	2025-11-07 04:23:13.000000000 +0000
@@ -1,7 +1,8 @@
 Source: nbdkit
 Section: admin
 Priority: optional
-Maintainer: Hilko Bengen <bengen@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Hilko Bengen <bengen@debian.org>
 Build-Depends: debhelper-compat (= 13), dh-exec,
  perl,
  pkgconf,
@@ -25,15 +26,15 @@ Build-Depends: debhelper-compat (= 13),
  libvirt-dev,
  zlib1g-dev,
  libzstd-dev,
- linux-image-amd64 [amd64] <!nocheck>,
- linux-image-rpi [armel] <!nocheck> | linux-image-marvell [armel] <!nocheck>,
- linux-image-arm64 [arm64] <!nocheck>,
- linux-image-4kc-malta [mips mipsel] <!nocheck> | linux-image-5kc-malta [mips mipsel] <!nocheck>,
- linux-image-5kc-malta [mips64 mips64el] <!nocheck>,
- linux-image-loong64 [loong64] <!nocheck>,
- linux-image-powerpc64le [ppc64el] <!nocheck>,
- linux-image-riscv64 [riscv64] <!nocheck>,
- linux-image-s390x [s390x] <!nocheck>,
+# linux-image-amd64 [amd64] <!nocheck>,
+# linux-image-rpi [armel] <!nocheck> | linux-image-marvell [armel] <!nocheck>,
+# linux-image-arm64 [arm64] <!nocheck>,
+# linux-image-4kc-malta [mips mipsel] <!nocheck> | linux-image-5kc-malta [mips mipsel] <!nocheck>,
+# linux-image-5kc-malta [mips64 mips64el] <!nocheck>,
+# linux-image-loong64 [loong64] <!nocheck>,
+# linux-image-powerpc64le [ppc64el] <!nocheck>,
+# linux-image-riscv64 [riscv64] <!nocheck>,
+# linux-image-s390x [s390x] <!nocheck>,
  busybox <!nocheck>,
  iproute2 <!nocheck>,
  jq <!nocheck>,
diff -pruN 1.42.9-1/debian/patches/0008-skip-test-file-block-without-losetup.patch 1.42.9-1ubuntu1/debian/patches/0008-skip-test-file-block-without-losetup.patch
--- 1.42.9-1/debian/patches/0008-skip-test-file-block-without-losetup.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.42.9-1ubuntu1/debian/patches/0008-skip-test-file-block-without-losetup.patch	2025-02-20 01:03:42.000000000 +0000
@@ -0,0 +1,26 @@
+Description: skip test if losetup fails
+ When losetup fails in the init phase of the test it isn't a real error of
+ nbdkit. Therefore detect this situation and skip the test in that case.
+ .
+ This can happen - for example - in common Ubuntu sbuild chroot environments.
+Forwarded: no
+X-Not-Forwarded-Reason: Will be submitted later if proven in our builds.
+Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Last-Update: 2020-02-25
+--- a/tests/test-file-block.c
++++ b/tests/test-file-block.c
+@@ -80,6 +80,14 @@ main (int argc, char *argv[])
+   /* losetup must be available. */
+   requires ("losetup --version");
+ 
++  /* losetup must able to find a new device */
++  r = system ("losetup -f");
++  if (r != 0) {
++    fprintf (stderr, "%s: losetup program must able to find a new device.\n",
++             program_name);
++    exit (77);
++  }
++
+   /* Create the temporary backing disk. */
+   fd = mkstemp (disk);
+   if (fd == -1) {
diff -pruN 1.42.9-1/debian/patches/0009-skip-tests-failing-in-build-env.patch 1.42.9-1ubuntu1/debian/patches/0009-skip-tests-failing-in-build-env.patch
--- 1.42.9-1/debian/patches/0009-skip-tests-failing-in-build-env.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.42.9-1ubuntu1/debian/patches/0009-skip-tests-failing-in-build-env.patch	2025-05-26 11:59:47.000000000 +0000
@@ -0,0 +1,302 @@
+Description: Skip tests that fail in Ubuntu build env
+ These will fail in common Ubuntu build environments.
+ For now disable just the failing test to allow the remaining coverage to
+ stay active.
+ Note: long term all tests needing root or modules could be converted to
+ autopkgtests
+ Note: this is less bad in Debian as they have world readable kernels:
+ "-rw-r--r--" while Ubuntu has "-rw------- 1 root root".
+ Another case is losetup which won't work in most environments.
+Forwarded: no
+X-Not-Forwarded-Reason: Ubuntu specific
+Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+        Gianfranco Costamagna <locutusofborg@debian.org>
+Last-Update: 2024-07-19
+
+Index: nbdkit-1.42.3-1ubuntu1/tests/Makefile.am
+===================================================================
+--- nbdkit-1.42.3-1ubuntu1.orig/tests/Makefile.am
++++ nbdkit-1.42.3-1ubuntu1/tests/Makefile.am
+@@ -284,7 +284,6 @@ TESTS += \
+ 	test-single-from-file.sh \
+ 	test-single-sh.sh \
+ 	test-captive.sh \
+-	test-captive-tls.sh \
+ 	test-captive-tls-certificates.sh \
+ 	test-captive-tls-psk.sh \
+ 	test-random-sock.sh \
+@@ -686,7 +685,6 @@ EXTRA_DIST += \
+ 	test-curl-header-script-fail.script \
+ 	test-curl-header-script-fail.sh \
+ 	$(NULL)
+-LIBGUESTFS_TESTS += test-curl
+ LIBNBD_TESTS += \
+ 	test-curl-head-forbidden \
+ 	test-curl-header-script \
+@@ -796,7 +794,6 @@ endif HAVE_CURL
+ endif HAVE_MKE2FS_WITH_D
+ 
+ # data plugin test.
+-LIBGUESTFS_TESTS += test-data
+ TESTS += \
+ 	test-data-64b.sh \
+ 	test-data-7E.sh \
+@@ -844,7 +841,6 @@ test_data_LDADD = libtest.la $(LIBGUESTF
+ # eval plugin test.
+ TESTS += \
+ 	test-eval.sh \
+-	test-eval-file.sh \
+ 	test-eval-exports.sh \
+ 	test-eval-extents.sh \
+ 	test-eval-cache.sh \
+@@ -893,8 +889,6 @@ test_file_block_nbd_LDADD = $(LIBNBD_LIB
+ 
+ # floppy plugin test.
+ TESTS += \
+-	test-floppy.sh \
+-	test-floppy-size.sh \
+ 	$(NULL)
+ EXTRA_DIST += \
+ 	test-floppy.sh \
+@@ -925,15 +919,12 @@ EXTRA_DIST += \
+ 
+ # iso plugin test.
+ if HAVE_ISO
+-TESTS += test-iso.sh
+ endif HAVE_ISO
+ EXTRA_DIST += test-iso.sh
+ 
+ # linuxdisk plugin test.
+ if HAVE_MKE2FS_WITH_D
+ TESTS += \
+-	test-linuxdisk.sh \
+-	test-linuxdisk-copy-out.sh \
+ 	$(NULL)
+ endif HAVE_MKE2FS_WITH_D
+ EXTRA_DIST += \
+@@ -943,11 +934,8 @@ EXTRA_DIST += \
+ 
+ # memory plugin test.
+ LIBGUESTFS_TESTS += \
+-	test-memory \
+-	test-memory-allocator-malloc \
+ 	$(NULL)
+ if HAVE_LIBZSTD
+-LIBGUESTFS_TESTS += test-memory-allocator-zstd
+ endif HAVE_LIBZSTD
+ TESTS += \
+ 	test-memory-allocator-malloc.sh \
+@@ -981,13 +969,11 @@ endif HAVE_LIBZSTD
+ 
+ if HAVE_LIBNBD
+ # nbd plugin test.
+-LIBGUESTFS_TESTS += test-nbd
+ TESTS += \
+ 	test-nbd-block-size.sh \
+ 	test-nbd-dynamic-content.sh \
+ 	test-nbd-dynamic-list.sh \
+ 	test-nbd-extents.sh \
+-	test-nbd-qcow2.sh \
+ 	test-nbd-tls.sh \
+ 	test-nbd-tls-psk.sh \
+ 	test-nbd-vsock.sh \
+@@ -1019,7 +1005,6 @@ test_null_LDADD = $(LIBNBD_LIBS)
+ 
+ # ondemand plugin test.
+ TESTS += \
+-	test-ondemand.sh \
+ 	test-ondemand-list.sh \
+ 	test-ondemand-locking.sh \
+ 	test-ondemand-share.sh \
+@@ -1038,10 +1023,7 @@ EXTRA_DIST += test-ones.sh
+ # partitioning plugin test.
+ TESTS += \
+ 	test-partitioning1.sh \
+-	test-partitioning2.sh \
+-	test-partitioning3.sh \
+ 	test-partitioning4.sh \
+-	test-partitioning5.sh \
+ 	test-partitioning6.sh \
+ 	$(NULL)
+ EXTRA_DIST += \
+@@ -1142,7 +1124,6 @@ TESTS += test-ssh.sh
+ endif HAVE_SSH
+ 
+ # tmpdisk plugin test.
+-LIBGUESTFS_TESTS += test-tmpdisk
+ TESTS += test-tmpdisk-command.sh
+ EXTRA_DIST += test-tmpdisk-command.sh
+ 
+@@ -1172,7 +1153,6 @@ if HAVE_VDDK
+ # check_LTLIBRARIES won't build a shared library (see automake manual).
+ # So we have to do this and add a dependency.
+ noinst_LTLIBRARIES += libvixDiskLib.la
+-LIBGUESTFS_TESTS += test-vddk
+ TESTS += \
+ 	test-vddk-dump-plugin.sh \
+ 	test-vddk-password-fd.sh \
+@@ -1305,7 +1285,6 @@ EXTRA_DIST += \
+ 	test-dump-plugin-example4.sh \
+ 	test-shebang-perl.sh \
+ 	$(NULL)
+-LIBGUESTFS_TESTS += test-perl
+ 
+ test_perl_SOURCES = test-lang-plugins.c test.h requires.c requires.h
+ test_perl_CFLAGS = \
+@@ -1326,7 +1305,6 @@ TESTS += \
+ 	test-python-exception.sh \
+ 	test-python-export-name.sh \
+ 	test-python-export-list.sh \
+-	test-python-is-tls.sh \
+ 	test-python-password.sh \
+ 	test-python-peer.sh \
+ 	test-python-thread-model.sh \
+@@ -1372,7 +1350,6 @@ DISTCLEANFILES += shebang-crlf.py
+ endif HAVE_PYTHON
+ 
+ # Shell (sh) plugin test.
+-LIBGUESTFS_TESTS += test-shell
+ check_DATA += test-shell.img
+ EXTRA_DIST += test-shell.sh
+ CLEANFILES += test-shell.img
+@@ -1408,7 +1385,6 @@ EXTRA_DIST += test.tcl
+ 
+ if HAVE_TCL
+ 
+-LIBGUESTFS_TESTS += test-tcl
+ 
+ test_tcl_SOURCES = test-lang-plugins.c test.h requires.c requires.h
+ test_tcl_CFLAGS = \
+@@ -1425,7 +1401,6 @@ EXTRA_DIST += test.lua
+ 
+ if HAVE_LUA
+ 
+-LIBGUESTFS_TESTS += test-lua
+ 
+ test_lua_SOURCES = test-lang-plugins.c test.h requires.c requires.h
+ test_lua_CFLAGS = \
+@@ -1455,7 +1430,6 @@ endif HAVE_GOLANG
+ TESTS += \
+ 	test-cc.sh \
+ 	test-cc-cpp.sh \
+-	test-shebang-cc.sh \
+ 	$(NULL)
+ if HAVE_OCAML
+ TESTS += \
+@@ -1617,7 +1591,6 @@ EXTRA_DIST += \
+ 
+ if HAVE_BZLIB
+ # bzip2 filter test.
+-LIBGUESTFS_TESTS += test-bzip2
+ 
+ test_bzip2_SOURCES = test-bzip2.c requires.c requires.h test.h
+ test_bzip2_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
+@@ -1661,10 +1634,7 @@ EXTRA_DIST += \
+ # cow filter test.
+ if HAVE_MKE2FS_WITH_D
+ TESTS += \
+-	test-cow.sh \
+-	test-cow-block-size.sh \
+ 	test-cow-extents1.sh \
+-	test-cow-extents2.sh \
+ 	test-cow-extents-large.sh \
+ 	test-cow-on-read.sh \
+ 	test-cow-on-read-caches.sh \
+@@ -1779,7 +1749,6 @@ EXTRA_DIST += test-exportname.sh
+ if HAVE_MKE2FS_WITH_D
+ if HAVE_EXT2
+ 
+-LIBGUESTFS_TESTS += test-ext2
+ 
+ test_ext2_SOURCES = test-ext2.c test.h
+ test_ext2_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
+@@ -1815,7 +1784,6 @@ TESTS += test-fua.sh
+ EXTRA_DIST += test-fua.sh
+ 
+ # gzip filter test.
+-LIBGUESTFS_TESTS += test-gzip
+ 
+ test_gzip_SOURCES = test-gzip.c test.h requires.c requires.h
+ test_gzip_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
+@@ -1912,7 +1880,6 @@ endif HAVE_LIBNBD
+ EXTRA_DIST += test-nozero.sh
+ 
+ # offset filter test.
+-LIBGUESTFS_TESTS += test-offset
+ 
+ test_offset_SOURCES = test-offset.c test.h
+ test_offset_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
+@@ -2075,7 +2042,6 @@ EXTRA_DIST += \
+ # spinning filter test.
+ TESTS += \
+ 	test-spinning-info.sh \
+-	test-spinning-mkfs.sh \
+ 	$(NULL)
+ EXTRA_DIST += \
+ 	test-spinning-info.sh \
+@@ -2106,7 +2072,6 @@ EXTRA_DIST += \
+ 
+ # tar filter test.
+ TESTS += \
+-	test-tar.sh \
+ 	test-tar-info.sh \
+ 	test-tar-info-xz.sh \
+ 	test-tar-info-xz-qcow2dec.sh \
+@@ -2145,7 +2110,6 @@ EXTRA_DIST += \
+ 	$(NULL)
+ 
+ # xz filter test.
+-LIBGUESTFS_TESTS += test-xz
+ 
+ test_xz_SOURCES = test-xz.c test.h requires.c requires.h
+ test_xz_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
+@@ -2155,12 +2119,6 @@ test_xz_LDADD = libtest.la $(LIBGUESTFS_
+ if HAVE_CURL
+ 
+ LIBGUESTFS_TESTS += \
+-	test-gzip-curl \
+-	test-tar-gzip-curl \
+-	test-lzip-curl \
+-	test-tar-lzip-curl \
+-	test-xz-curl \
+-	test-tar-xz-curl \
+ 	$(NULL)
+ 
+ test_gzip_curl_SOURCES = \
+@@ -2368,36 +2326,6 @@ TESTS += \
+ 	test-old-plugins-i686-Linux-v1.38.4-dump.sh \
+ 	test-old-plugins-i686-Linux-v1.38.4-nbd.sh \
+ 	test-old-plugins-i686-Linux-v1.38.4-fs.sh \
+-	test-old-plugins-x86_64-Linux-v1.0.0-version.sh \
+-	test-old-plugins-x86_64-Linux-v1.0.0-help.sh \
+-	test-old-plugins-x86_64-Linux-v1.0.0-dump.sh \
+-	test-old-plugins-x86_64-Linux-v1.0.0-nbd.sh \
+-	test-old-plugins-x86_64-Linux-v1.0.0-fs.sh \
+-	test-old-plugins-x86_64-Linux-v1.2.8-version.sh \
+-	test-old-plugins-x86_64-Linux-v1.2.8-help.sh \
+-	test-old-plugins-x86_64-Linux-v1.2.8-dump.sh \
+-	test-old-plugins-x86_64-Linux-v1.2.8-nbd.sh \
+-	test-old-plugins-x86_64-Linux-v1.2.8-fs.sh \
+-	test-old-plugins-x86_64-Linux-v1.8.4-version.sh \
+-	test-old-plugins-x86_64-Linux-v1.8.4-help.sh \
+-	test-old-plugins-x86_64-Linux-v1.8.4-dump.sh \
+-	test-old-plugins-x86_64-Linux-v1.8.4-nbd.sh \
+-	test-old-plugins-x86_64-Linux-v1.8.4-fs.sh \
+-	test-old-plugins-x86_64-Linux-v1.12.8-version.sh \
+-	test-old-plugins-x86_64-Linux-v1.12.8-help.sh \
+-	test-old-plugins-x86_64-Linux-v1.12.8-dump.sh \
+-	test-old-plugins-x86_64-Linux-v1.12.8-nbd.sh \
+-	test-old-plugins-x86_64-Linux-v1.12.8-fs.sh \
+-	test-old-plugins-x86_64-Linux-v1.18.2-version.sh \
+-	test-old-plugins-x86_64-Linux-v1.18.2-help.sh \
+-	test-old-plugins-x86_64-Linux-v1.18.2-dump.sh \
+-	test-old-plugins-x86_64-Linux-v1.18.2-nbd.sh \
+-	test-old-plugins-x86_64-Linux-v1.18.2-fs.sh \
+-	test-old-plugins-x86_64-Linux-v1.38.4-version.sh \
+-	test-old-plugins-x86_64-Linux-v1.38.4-help.sh \
+-	test-old-plugins-x86_64-Linux-v1.38.4-dump.sh \
+-	test-old-plugins-x86_64-Linux-v1.38.4-nbd.sh \
+-	test-old-plugins-x86_64-Linux-v1.38.4-fs.sh \
+ 	$(NULL)
+ 
+ test-old-plugins-%.sh:
diff -pruN 1.42.9-1/debian/patches/series 1.42.9-1ubuntu1/debian/patches/series
--- 1.42.9-1/debian/patches/series	2025-11-06 22:29:26.000000000 +0000
+++ 1.42.9-1ubuntu1/debian/patches/series	2025-11-07 04:23:13.000000000 +0000
@@ -6,3 +6,5 @@
 0009-cc-plugin-Filter-out-ffile-prefix-map-etc.-from-CFLA.patch
 0007-Disable-some-tests.patch
 0010-Fix-glibc-2.40-crash.patch
+0008-skip-test-file-block-without-losetup.patch
+0009-skip-tests-failing-in-build-env.patch
