diff -pruN 0.12.1-2/debian/changelog 0.12.1-2ubuntu1/debian/changelog
--- 0.12.1-2/debian/changelog	2025-08-25 20:40:04.000000000 +0000
+++ 0.12.1-2ubuntu1/debian/changelog	2025-11-19 08:17:41.000000000 +0000
@@ -1,3 +1,10 @@
+speech-dispatcher-contrib (0.12.1-2ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+   - autopkgtest: Manually handle systemd user session (LP #2104259)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 19 Nov 2025 09:17:41 +0100
+
 speech-dispatcher-contrib (0.12.1-2) unstable; urgency=medium
 
   * Upload to unstable.
@@ -47,6 +54,12 @@ speech-dispatcher-contrib (0.12.0-2) uns
 
  -- Samuel Thibault <sthibault@debian.org>  Mon, 24 Feb 2025 21:32:18 +0100
 
+speech-dispatcher-contrib (0.12.0-1ubuntu1) plucky; urgency=medium
+
+  * autopkgtest: Manually handle systemd user session (LP: #2104259).
+
+ -- Alessandro Astone <alessandro.astone@canonical.com>  Tue, 01 Apr 2025 15:53:13 +0200
+
 speech-dispatcher-contrib (0.12.0-1) unstable; urgency=medium
 
   * New upstream release (Closes: Bug#1097914)
diff -pruN 0.12.1-2/debian/control 0.12.1-2ubuntu1/debian/control
--- 0.12.1-2/debian/control	2025-08-25 20:40:04.000000000 +0000
+++ 0.12.1-2ubuntu1/debian/control	2025-11-19 08:17:41.000000000 +0000
@@ -1,7 +1,8 @@
 Source: speech-dispatcher-contrib
 Section: contrib/sound
 Priority: optional
-Maintainer: Debian TTS Team <tts-project@alioth-lists.debian.net>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian TTS Team <tts-project@alioth-lists.debian.net>
 Uploaders:
  Paul Gevers <elbrus@debian.org>, Samuel Thibault <sthibault@debian.org>
 Build-Depends:
diff -pruN 0.12.1-2/debian/tests/tests 0.12.1-2ubuntu1/debian/tests/tests
--- 0.12.1-2/debian/tests/tests	2025-05-06 20:42:06.000000000 +0000
+++ 0.12.1-2ubuntu1/debian/tests/tests	2025-11-19 08:15:34.000000000 +0000
@@ -11,4 +11,7 @@ dh_auto_configure 2>&1
 make check -C src/tests 2>&1
 make testsuite -C src/tests
 
+export XDG_RUNTIME_DIR=/run/user/$(id -u)
+systemctl --user start pulseaudio
+
 (cd src/tests ; ./testsuite) || (cat src/tests/testsuite.log ; cat $XDG_RUNTIME_DIR/speech-dispatcher/log/speech-dispatcher.log ; false)
