Merge remote-tracking branch 'origin/bugfix/10943-seahorse-associations' into testing

Fix-committed: #10943

config/chroot_local-hooks/59-file_associations

-#!/bin/sh
-
-set -eu
-
-echo "Configuring file associations"
-
-defaults_file=/etc/gnome/defaults.list
-
-if grep -E '^application/pgp-keys=' "$defaults_file"; then
-    echo "application/pgp-keys is already configured in $defaults_file" >&2
-    exit 1
-else
-   # XXX: Stretch -- this fixes https://bugs.freedesktop.org/show_bug.cgi?id=93656
-   # (Tails#10889, Tails#10571)
-   echo 'application/pgp-keys=seahorse-pgp-keys.desktop' \
-	>> "$defaults_file"
-   echo 'application/x-iwork-keynote-sffkey=seahorse-pgp-keys.desktop' \
-	>> "$defaults_file"
-fi

config/chroot_local-includes/etc/skel/.local/share/applications/mimeapps.list

+# XXX: Stretch -- the seahorse associations in here fix:
+# - https://bugs.freedesktop.org/show_bug.cgi?id=93656
+# - Tails#10889
+# - Tails#10571
+# - Tails#10943
+
 [Default Applications]
+application/pgp-encrypted=seahorse-pgp-encrypted.desktop
+application/pgp-keys=seahorse-pgp-keys.desktop
+application/pgp-signature=seahorse-pgp-signature.desktop
+application/x-iwork-keynote-sffkey=seahorse-pgp-keys.desktop
 x-scheme-handler/mailto=icedove.desktop
 
 [Added Associations]
-x-scheme-handler/mailto=icedove.desktop;
+application/pgp-encrypted=seahorse-pgp-encrypted.desktop
+application/pgp-keys=seahorse-pgp-keys.desktop
+application/pgp-signature=seahorse-pgp-signature.desktop
+application/x-iwork-keynote-sffkey=seahorse-pgp-keys.desktop
+x-scheme-handler/mailto=icedove.desktop