diff -pruN 1.0.0-1/debian/changelog 1.0.0-1ubuntu1/debian/changelog
--- 1.0.0-1/debian/changelog	2025-09-29 02:43:54.000000000 +0000
+++ 1.0.0-1ubuntu1/debian/changelog	2025-10-06 21:41:41.000000000 +0000
@@ -1,3 +1,9 @@
+rust-bitfields (1.0.0-1ubuntu1) questing; urgency=medium
+
+  * Adjust update-tests.patch for Ubuntu 25.10's rustc
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 06 Oct 2025 17:41:41 -0400
+
 rust-bitfields (1.0.0-1) unstable; urgency=medium
 
   * Team upload
diff -pruN 1.0.0-1/debian/control 1.0.0-1ubuntu1/debian/control
--- 1.0.0-1/debian/control	2025-09-29 02:43:54.000000000 +0000
+++ 1.0.0-1ubuntu1/debian/control	2025-10-06 21:41:41.000000000 +0000
@@ -7,7 +7,8 @@ Build-Depends-Arch: cargo:native <!noche
  rustc:native (>= 1.83.0) <!nocheck>,
  libstd-rust-dev <!nocheck>,
  librust-bitfields-impl-1+default-dev <!nocheck>
-Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Uploaders:
  Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 Standards-Version: 4.7.2
@@ -15,7 +16,6 @@ Vcs-Git: https://salsa.debian.org/rust-t
 Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/bitfields
 Homepage: https://github.com/gregorygaines/bitfields-rs
 X-Cargo-Crate: bitfields
-Rules-Requires-Root: no
 
 Package: librust-bitfields-dev
 Architecture: any
diff -pruN 1.0.0-1/debian/patches/update-tests.patch 1.0.0-1ubuntu1/debian/patches/update-tests.patch
--- 1.0.0-1/debian/patches/update-tests.patch	2025-09-29 02:43:54.000000000 +0000
+++ 1.0.0-1ubuntu1/debian/patches/update-tests.patch	2025-10-06 21:37:59.000000000 +0000
@@ -11,18 +11,7 @@ not be forwarded since upstream made an
 is not compatible with how Debian manages rustc.
 
 Forwarded: not-needed
----
---- a/tests/compile_error_cases/bitfield_bit_ops_disabled.stderr
-+++ b/tests/compile_error_cases/bitfield_bit_ops_disabled.stderr
-@@ -9,5 +9,6 @@
-    |
- help: there is a method `set_bits` with a similar name
-    |
--14 |     bitfield.set_bits(0);
--   |              ~~~~~~~~
-+14 -     bitfield.get_bit(0);
-+14 +     bitfield.set_bits(0);
-+   |
+----
 --- a/tests/compile_error_cases/bitfield_field_defined_bits_0.stderr
 +++ b/tests/compile_error_cases/bitfield_field_defined_bits_0.stderr
 @@ -2,4 +2,4 @@
diff -pruN 1.0.0-1/debian/watch 1.0.0-1ubuntu1/debian/watch
--- 1.0.0-1/debian/watch	2025-09-29 02:43:54.000000000 +0000
+++ 1.0.0-1ubuntu1/debian/watch	2025-10-06 21:38:00.000000000 +0000
@@ -1,4 +1,6 @@
-version=4
-opts=filenamemangle=s/.*\/(.*)\/download/bitfields-$1\.tar\.gz/g,\
-uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\.?\d*)$/$1~$2/ \
-https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=crates.io/bitfields .*/crates/bitfields/@ANY_VERSION@/download
+Version: 5
+
+Source: https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=crates.io/bitfields
+Matching-Pattern:  .*/crates/bitfields/@ANY_VERSION@/download
+Filenamemangle: s/.*\/(.*)\/download/bitfields-$1\.tar\.gz/g
+Uversionmangle: s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\.?\d*)$/$1~$2/