diff -Nru devhelp-41.2/debian/changelog devhelp-41.2/debian/changelog
--- devhelp-41.2/debian/changelog	2022-02-13 13:20:49.000000000 +0000
+++ devhelp-41.2/debian/changelog	2023-10-02 15:41:57.000000000 +0000
@@ -1,3 +1,9 @@
+devhelp (41.2-2ubuntu1) jammy-security; urgency=medium
+
+  * Run autopkgtests through xvfb, required with webkit2gtk 2.41 (LP: #2038106)
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Mon, 02 Oct 2023 11:41:57 -0400
+
 devhelp (41.2-2) unstable; urgency=medium
 
   * Team upload
diff -Nru devhelp-41.2/debian/control devhelp-41.2/debian/control
--- devhelp-41.2/debian/control	2022-02-13 13:20:49.000000000 +0000
+++ devhelp-41.2/debian/control	2023-10-02 15:41:57.000000000 +0000
@@ -5,8 +5,9 @@
 Source: devhelp
 Section: devel
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Jeremy Bicha <jbicha@ubuntu.com>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Tim Lunn <tim@feathertop.org>
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-gir,
                dh-sequence-gnome,
diff -Nru devhelp-41.2/debian/control.in devhelp-41.2/debian/control.in
--- devhelp-41.2/debian/control.in	2022-02-13 13:20:49.000000000 +0000
+++ devhelp-41.2/debian/control.in	2023-10-02 15:41:57.000000000 +0000
@@ -1,7 +1,8 @@
 Source: devhelp
 Section: devel
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper-compat (= 13),
                dh-sequence-gir,
diff -Nru devhelp-41.2/debian/gbp.conf devhelp-41.2/debian/gbp.conf
--- devhelp-41.2/debian/gbp.conf	2022-02-13 13:20:49.000000000 +0000
+++ devhelp-41.2/debian/gbp.conf	2023-10-02 15:41:57.000000000 +0000
@@ -1,6 +1,7 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/master
+debian-branch = ubuntu/jammy
+debian-tag = ubuntu/%(version)s
 upstream-branch = upstream/latest
 
 [buildpackage]
diff -Nru devhelp-41.2/debian/tests/control devhelp-41.2/debian/tests/control
--- devhelp-41.2/debian/tests/control	2022-02-13 13:20:49.000000000 +0000
+++ devhelp-41.2/debian/tests/control	2023-10-02 15:41:57.000000000 +0000
@@ -1,3 +1,3 @@
 Tests: libdevhelp-dev
 Restrictions: allow-stderr, superficial
-Depends: build-essential, libdevhelp-dev, pkg-config
+Depends: build-essential, libdevhelp-dev, pkg-config, xauth, xvfb
diff -Nru devhelp-41.2/debian/tests/libdevhelp-dev devhelp-41.2/debian/tests/libdevhelp-dev
--- devhelp-41.2/debian/tests/libdevhelp-dev	2022-02-13 13:20:49.000000000 +0000
+++ devhelp-41.2/debian/tests/libdevhelp-dev	2023-10-02 15:41:57.000000000 +0000
@@ -31,4 +31,7 @@
 # Deliberately word-splitting pkg-config's output:
 # shellcheck disable=SC2046
 "${CC}" -otrivial trivial.c $("${PKG_CONFIG}" --cflags --libs libdevhelp-3.0)
-./trivial
+[ -x trivial ]
+# Switch environment variable to GTK_A11Y=none when devhelp switches to gtk4
+NO_AT_BRIDGE=1 xvfb-run -a dbus-run-session -- ./trivial
+echo "run: OK"