Control: retitle -1 trixie-pu: package btrfs-assistant/2.1.1-1+deb13u1 Control: reassign -1 release.debian.org Control: tags -1 trixie
I am forwarding a stable update request by the btrfs-assistant maintainer. [ Checklist ] [x] *all* changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in (old)stable [x] the issue is verified as fixed in unstable
diff -Nru btrfs-assistant-2.1.1/debian/changelog btrfs-assistant-2.1.1/debian/changelog --- btrfs-assistant-2.1.1/debian/changelog 2024-06-05 12:52:45.000000000 +0200 +++ btrfs-assistant-2.1.1/debian/changelog 2026-06-13 23:09:13.000000000 +0200 @@ -1,3 +1,10 @@ +btrfs-assistant (2.1.1-1+deb13u1) trixie; urgency=medium + + * Prevent clobbering user xdg-runtime-dir when running under Wayland + (Closes: #1127797). + + -- Dale Richards <[email protected]> Sat, 13 Jun 2026 22:09:13 +0100 + btrfs-assistant (2.1.1-1) unstable; urgency=medium * New upstream version 2.1.1 diff -Nru btrfs-assistant-2.1.1/debian/patches/0002-prevent-clobbering-user-xdg-runtime-dir.patch btrfs-assistant-2.1.1/debian/patches/0002-prevent-clobbering-user-xdg-runtime-dir.patch --- btrfs-assistant-2.1.1/debian/patches/0002-prevent-clobbering-user-xdg-runtime-dir.patch 1970-01-01 01:00:00.000000000 +0100 +++ btrfs-assistant-2.1.1/debian/patches/0002-prevent-clobbering-user-xdg-runtime-dir.patch 2026-06-13 23:09:13.000000000 +0200 @@ -0,0 +1,39 @@ +From: Dale Richards <[email protected]> +Date: Sat, 13 Jun 2026 22:03:30 +0100 +Origin: upstream, https://gitlab.com/btrfs-assistant/btrfs-assistant/-/merge_requests/85 +Applied-Upstream: 2.2, https://gitlab.com/btrfs-assistant/btrfs-assistant/-/merge_requests/85 +Description: prevent clobbering user xdg-runtime-dir + Fixes #1127797 + +--- + src/btrfs-assistant-launcher | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/btrfs-assistant-launcher b/src/btrfs-assistant-launcher +index ca72161..39ac7e7 100755 +--- a/src/btrfs-assistant-launcher ++++ b/src/btrfs-assistant-launcher +@@ -1,7 +1,7 @@ + #!/usr/bin/env bash + + # Define the base command with common options +-command="pkexec btrfs-assistant --xdg-runtime=\"${XDG_RUNTIME_DIR}\"" ++command="pkexec btrfs-assistant" + + # Add xdg-desktop option if XDG_CURRENT_DESKTOP is set + if [[ -n ${XDG_CURRENT_DESKTOP} ]]; then +@@ -10,10 +10,13 @@ fi + + # Add platform and display options when using Wayland + if [[ -n "${WAYLAND_DISPLAY}" ]]; then +- command="${command} --display=\"${WAYLAND_DISPLAY}\"" ++ command="${command} --display=\"${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY}\"" + if [[ -n "${QT_QPA_PLATFORM}" ]]; then + command="${command} --platform=\"${QT_QPA_PLATFORM}\"" + fi ++else ++ # only needed for X session ++ command="${command} --xdg-runtime=\"${XDG_RUNTIME_DIR}\"" + fi + + # Add platformtheme option if QT_QPA_PLATFORMTHEME is set diff -Nru btrfs-assistant-2.1.1/debian/patches/series btrfs-assistant-2.1.1/debian/patches/series --- btrfs-assistant-2.1.1/debian/patches/series 2024-05-25 22:05:40.000000000 +0200 +++ btrfs-assistant-2.1.1/debian/patches/series 2026-06-13 23:03:37.000000000 +0200 @@ -1 +1,2 @@ 0001-README-Remove-missing-images.patch +0002-prevent-clobbering-user-xdg-runtime-dir.patch
