diff -pruN 9.4.8.0+ds-3/debian/changelog 9.4.8.0+ds-3ubuntu1/debian/changelog
--- 9.4.8.0+ds-3/debian/changelog	2025-05-22 16:47:55.000000000 +0000
+++ 9.4.8.0+ds-3ubuntu1/debian/changelog	2025-05-23 10:04:10.000000000 +0000
@@ -1,3 +1,11 @@
+jruby (9.4.8.0+ds-3ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/t/control: mark mri-extra, spec-ruby, mri-stdlib as flaky. See
+      launchpad bug 2054943.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 23 May 2025 12:04:10 +0200
+
 jruby (9.4.8.0+ds-3) unstable; urgency=medium
 
   * Team Upload.
@@ -5,6 +13,14 @@ jruby (9.4.8.0+ds-3) unstable; urgency=m
 
  -- Nilesh Patra <nilesh@debian.org>  Thu, 22 May 2025 22:17:55 +0530
 
+jruby (9.4.8.0+ds-2ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/t/control: mark mri-extra, spec-ruby, mri-stdlib as flaky. See
+      launchpad bug 2054943.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 13 Feb 2025 07:01:51 +0100
+
 jruby (9.4.8.0+ds-2) unstable; urgency=medium
 
   * Use secure URI in Homepage field.
@@ -12,6 +28,14 @@ jruby (9.4.8.0+ds-2) unstable; urgency=m
 
  -- Jérôme Charaoui <jerome@riseup.net>  Sun, 09 Feb 2025 16:13:37 -0500
 
+jruby (9.4.8.0+ds-1ubuntu1) oracular; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - d/t/control: mark mri-extra, spec-ruby, mri-stdlib as flaky. See
+      launchpad bug 2054943.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 03 Aug 2024 07:17:59 +0200
+
 jruby (9.4.8.0+ds-1) unstable; urgency=medium
 
   * New upstream version 9.4.8.0+ds
@@ -22,6 +46,14 @@ jruby (9.4.8.0+ds-1) unstable; urgency=m
 
  -- Jérôme Charaoui <jerome@riseup.net>  Fri, 02 Aug 2024 14:42:22 -0400
 
+jruby (9.4.6.0+ds-1.1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/t/control: mark mri-extra, spec-ruby, mri-stdlib as flaky. See
+      launchpad bug 2054943.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 02 May 2024 14:54:06 +0200
+
 jruby (9.4.6.0+ds-1.1) unstable; urgency=medium
 
   * Non-maintainer upload
@@ -31,6 +63,33 @@ jruby (9.4.6.0+ds-1.1) unstable; urgency
 
  -- Bastian Germann <bage@debian.org>  Fri, 19 Apr 2024 22:06:26 +0000
 
+jruby (9.4.6.0+ds-1ubuntu3) noble; urgency=medium
+
+  * Update libfixposix dependency to time64_t variant
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 20 Mar 2024 07:56:30 +0100
+
+jruby (9.4.6.0+ds-1ubuntu2) noble; urgency=medium
+
+  * Rebuild against new libfixposix4t64.
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 19 Mar 2024 17:04:45 +0100
+
+jruby (9.4.6.0+ds-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2056521). Remaining changes:
+    - d/t/control: mark mri-extra, spec-ruby, mri-stdlib as flaky. See
+      launchpad bug 2054943.
+  * Drop Changes:
+    - d/rules: copy jruby pom files so that they can by updated by
+      maven-install-plugin. Fixes ftbfs (launchpad bug 2054942). Fixed
+      in Debian bug 1064554.
+    - d/p/jruby-8081-invert-o-nonblock-flag.patch: apply upstream patch
+      to fix fcntl call. This allows workaround for launchpad
+      bug 2054943. Fixed upstream.
+
+ -- Vladimir Petko <vladimir.petko@canonical.com>  Fri, 08 Mar 2024 20:55:39 +1300
+
 jruby (9.4.6.0+ds-1) unstable; urgency=medium
 
   * New upstream version 9.4.6.0+ds
@@ -45,6 +104,18 @@ jruby (9.4.6.0+ds-1) unstable; urgency=m
 
  -- Jérôme Charaoui <jerome@riseup.net>  Wed, 28 Feb 2024 19:39:52 -0500
 
+jruby (9.4.5.0+ds-1ubuntu1) noble; urgency=medium
+
+  * d/rules: copy jruby pom files so that they can by updated by
+    maven-install-plugin. Fixes ftbfs (LP: #2054942).
+  * d/t/control: mark mri-extra, spec-ruby, mri-stdlib as flaky. See
+    launchpad bug 2054943.
+  * d/p/jruby-8081-invert-o-nonblock-flag.patch: apply upstream patch
+    to fix fcntl call. This allows workaround for launchpad
+    bug 2054943.
+
+ -- Vladimir Petko <vladimir.petko@canonical.com>  Mon, 26 Feb 2024 11:55:18 +1300
+
 jruby (9.4.5.0+ds-1) unstable; urgency=medium
 
   * Rebuild for unstable.
diff -pruN 9.4.8.0+ds-3/debian/tests/control 9.4.8.0+ds-3ubuntu1/debian/tests/control
--- 9.4.8.0+ds-3/debian/tests/control	2025-05-22 16:47:55.000000000 +0000
+++ 9.4.8.0+ds-3ubuntu1/debian/tests/control	2025-05-22 21:22:25.000000000 +0000
@@ -112,7 +112,7 @@ Depends:
  ruby-rspec,
  ruby-test-unit,
  @,
-Restrictions: allow-stderr
+Restrictions: allow-stderr, flaky
 Architecture: amd64, arm64
 
 Tests: mri-core
@@ -140,7 +140,7 @@ Depends:
  ruby-rspec,
  ruby-test-unit,
  @,
-Restrictions: allow-stderr
+Restrictions: allow-stderr, flaky
 Architecture: amd64, arm64
 
 Tests: mri-stdlib
@@ -154,5 +154,5 @@ Depends:
  ruby-rspec,
  ruby-test-unit,
  @,
-Restrictions: allow-stderr
+Restrictions: allow-stderr, flaky
 Architecture: amd64, arm64