diff -pruN 1:1.54.1-2/debian/changelog 1:1.54.1-3/debian/changelog
--- 1:1.54.1-2/debian/changelog	2025-05-24 19:31:19.000000000 +0000
+++ 1:1.54.1-3/debian/changelog	2025-11-09 19:28:00.000000000 +0000
@@ -1,3 +1,16 @@
+libguestfs (1:1.54.1-3) unstable; urgency=medium
+
+  * Replace libgirepository1.0-dev build-dependency.
+    Thanks to Simon McVittie (Closes: #1118866)
+  * Add Lintian override for uses-dpkg-database-directly
+  * Move girepository-1.0 to multiarch dir.
+    Thanks to Simon McVittie (Closes: #1118517)
+  * Fix jquery link to eliminate embedded-javascript-library Lintian warning
+  * Use current stable instead of oldoldstable for autopkgtest
+    (Closes: #1120436)
+
+ -- Hilko Bengen <bengen@debian.org>  Sun, 09 Nov 2025 20:28:00 +0100
+
 libguestfs (1:1.54.1-2) unstable; urgency=medium
 
   * Replace isc-dhcp-client build-dependency with dhcpcd-base.
diff -pruN 1:1.54.1-2/debian/control 1:1.54.1-3/debian/control
--- 1:1.54.1-2/debian/control	2025-05-22 09:42:34.000000000 +0000
+++ 1:1.54.1-3/debian/control	2025-11-09 14:43:39.000000000 +0000
@@ -46,7 +46,8 @@ Build-Depends: dpkg-dev (>= 1.22.5), deb
   libstring-shellquote-perl,
   libsys-virt-perl, libwin-hivex-perl,
   libfuse-dev, fuse3 (>= 3.10.1-3) | fuse (<< 3),
-  libglib2.0-dev, gjs [!s390x !armel] <!nocheck>, gobject-introspection, libgirepository1.0-dev,
+  libglib2.0-dev, gjs [!s390x !armel] <!nocheck>,
+  gobject-introspection (>= 1.80), gir1.2-gio-2.0-dev, gir1.2-glib-2.0-dev,
   libgtk-3-dev,
   db-util,
   netpbm, icoutils,
@@ -475,7 +476,7 @@ Description: guest disk image management
  This package contains Ruby bindings to libguestfs.
 
 Package: libguestfs-gobject-1.0-0t64
-Provides: ${t64:Provides}
+Provides: ${t64:Provides}, ${gir:Provides}
 Replaces: libguestfs-gobject-1.0-0
 Breaks: libguestfs-gobject-1.0-0 (<< ${source:Version})
 Section: libs
@@ -494,7 +495,8 @@ Package: libguestfs-gobject-dev
 Section: libdevel
 Architecture: linux-any
 Multi-Arch: same
-Depends: libguestfs-gobject-1.0-0t64 (= ${binary:Version}), gir1.2-guestfs-1.0 (= ${binary:Version}), ${misc:Depends}
+Provides: ${gir:Provides}
+Depends: ${gir:Depends}, ${misc:Depends}
 Conflicts: libguestfs0t64 (<< 1:1.14.9-1~)
 Description: guest disk image management system - GObject development headers
  The libguestfs library allows accessing and modifying guest disk
@@ -506,6 +508,7 @@ Description: guest disk image management
 Package: gir1.2-guestfs-1.0
 Section: introspection
 Architecture: linux-any
+Provides: ${gir:Provides}
 Depends: libguestfs-gobject-1.0-0t64 (= ${binary:Version}), ${gir:Depends}, ${misc:Depends}
 Conflicts: libguestfs0t64 (<< 1:1.14.9-1~)
 Description: guest disk image management system - GObject introspection files
diff -pruN 1:1.54.1-2/debian/gir1.2-guestfs-1.0.install 1:1.54.1-3/debian/gir1.2-guestfs-1.0.install
--- 1:1.54.1-2/debian/gir1.2-guestfs-1.0.install	2023-07-23 11:30:56.000000000 +0000
+++ 1:1.54.1-3/debian/gir1.2-guestfs-1.0.install	2025-11-09 19:27:50.000000000 +0000
@@ -1 +1 @@
-usr/lib/*-*/girepository-1.0/ usr/lib/
+usr/lib/*-*/girepository-1.0
diff -pruN 1:1.54.1-2/debian/libguestfs-java.links 1:1.54.1-3/debian/libguestfs-java.links
--- 1:1.54.1-2/debian/libguestfs-java.links	2023-07-23 11:30:56.000000000 +0000
+++ 1:1.54.1-3/debian/libguestfs-java.links	2025-11-09 19:27:50.000000000 +0000
@@ -1,3 +1,3 @@
-/usr/share/javascript/jquery/jquery.min.js                     usr/share/doc/libguestfs-java/api/script-dir/jquery-3.6.0.min.js
+/usr/share/javascript/jquery/jquery.min.js                     usr/share/doc/libguestfs-java/api/script-dir/jquery-3.7.1.min.js
 /usr/share/javascript/jquery-ui/themes/base/jquery-ui.min.css  usr/share/doc/libguestfs-java/api/script-dir/jquery-ui.min.css
 /usr/share/javascript/jquery-ui/jquery-ui.min.js               usr/share/doc/libguestfs-java/api/script-dir/jquery-ui.min.js
diff -pruN 1:1.54.1-2/debian/libguestfs0t64.lintian-overrides 1:1.54.1-3/debian/libguestfs0t64.lintian-overrides
--- 1:1.54.1-2/debian/libguestfs0t64.lintian-overrides	2024-03-11 20:55:16.000000000 +0000
+++ 1:1.54.1-3/debian/libguestfs0t64.lintian-overrides	2025-11-09 19:27:35.000000000 +0000
@@ -1,3 +1,5 @@
 # As of 2.88dsf-53.3, sysvinit is no longer essential
 libguestfs0t64: depends-on-essential-package-without-using-version depends: sysvinit
 libguestfs0t64: package-name-doesnt-match-sonames libguestfs0
+# This is okay.
+libguestfs0t64: uses-dpkg-database-directly
diff -pruN 1:1.54.1-2/debian/tests/extlinux 1:1.54.1-3/debian/tests/extlinux
--- 1:1.54.1-2/debian/tests/extlinux	2023-07-23 11:30:56.000000000 +0000
+++ 1:1.54.1-3/debian/tests/extlinux	2025-11-09 19:27:50.000000000 +0000
@@ -33,7 +33,7 @@ mmdebstrap \
     --customize-hook='echo host > "$1/etc/hostname"' \
     --customize-hook='echo "127.0.0.1 localhost host" > "$1/etc/hosts"' \
     --customize-hook='echo "/dev/sda1 / auto errors=remount-ro 0 1" > "$1/etc/fstab"' \
-    bullseye debian-bullseye.tar
+    trixie debian-trixie.tar
 
 cat << END > extlinux.conf
 default linux
@@ -57,7 +57,7 @@ if [ ! -e ./id_rsa ] || [ ! -e ./id_rsa.
 fi
 
 guestfish <<EOF
-sparse debian-bullseye.img 1G
+sparse debian-trixie.img 1G
 run
 
 part-disk /dev/sda mbr
@@ -66,9 +66,8 @@ mkfs ext2 /dev/sda1
 
 mount /dev/sda1 /
 
-tar-in debian-bullseye.tar /
+tar-in debian-trixie.tar /
 
-mkdir /root/.ssh
 copy-in id_rsa.pub /root/
 mv /root/id_rsa.pub /root/.ssh/authorized_keys
 chown 0 0 /root/.ssh/authorized_keys
@@ -82,7 +81,7 @@ EOF
 
 qemu-system-${QEMU_FLAVOR} -m 1G -net user,hostfwd=tcp::10022-:22,hostfwd=tcp::12222-:2222 \
 	-net nic -nographic -serial mon:stdio \
-	-drive file=debian-bullseye.img,format=raw >qemu.log </dev/null 2>&1 &
+	-drive file=debian-trixie.img,format=raw >qemu.log </dev/null 2>&1 &
 
 QEMUPID=$!
 
@@ -115,6 +114,6 @@ wait $QEMUPID
 
 trap - EXIT
 
-rm debian-bullseye.img debian-bullseye.tar extlinux.conf id_rsa id_rsa.pub interfaces qemu.log
+rm debian-trixie.img debian-trixie.tar extlinux.conf id_rsa id_rsa.pub interfaces qemu.log
 
 exit 0