From 2fdd359ff1135a1f93245213f552f3b93f7c68fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Wed, 9 Nov 2022 10:35:59 +0100
Subject: [PATCH] Make osk-wayland obsolete
squeekboard 1.20.0-2 from Debian will use update-alternatives to manage
the /u/s/a/sm.puri.OSK0.desktop finally allowing us to obsolete
osk-wayland here.
We do so by making sm.puri.OSK0-legacy.desktop use update-alternatives
too and giving it a lower priority than squeekboards.
As older squeekboard in PureOS Byzantium doesn't worry about
sm.puri.OSK0 at all so an update of librem5-base-defaults won't change
anything for the user.
We can drop sm.puri.OSK0-legacy and osk-wayland for Crimson
---
debian/librem5-base-defaults.alternatives | 4 ++++
debian/librem5-base-defaults.install | 2 +-
default/{sm.puri.OSK0.desktop => sm.puri.OSK0-legacy.desktop} | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 debian/librem5-base-defaults.alternatives
rename default/{sm.puri.OSK0.desktop => sm.puri.OSK0-legacy.desktop} (85%)
diff --git a/debian/librem5-base-defaults.alternatives b/debian/librem5-base-defaults.alternatives
new file mode 100644
index 0000000..ebf7e26
--- /dev/null
+++ b/debian/librem5-base-defaults.alternatives
@@ -0,0 +1,4 @@
+Name: Phosh-OSK
+Link: /usr/share/applications/sm.puri.OSK0.desktop
+Alternative: /usr/share/applications/sm.puri.OSK0-legacy.desktop
+Priority: 20
diff --git a/debian/librem5-base-defaults.install b/debian/librem5-base-defaults.install
index 04edb93..07d32f0 100644
--- a/debian/librem5-base-defaults.install
+++ b/debian/librem5-base-defaults.install
@@ -8,7 +8,7 @@ default/audio/profile-sets usr/share/pulseaudio/alsa-mixer/
default/audio/ucm2 usr/share/alsa/
default/audio/alsa-restore.service.d lib/systemd/system/
-default/sm.puri.OSK0.desktop usr/share/applications/
+default/sm.puri.OSK0-legacy.desktop usr/share/applications/
default/osk-wayland usr/bin/
# librem5 specific environment variables
diff --git a/default/sm.puri.OSK0.desktop b/default/sm.puri.OSK0-legacy.desktop
similarity index 85%
rename from default/sm.puri.OSK0.desktop
rename to default/sm.puri.OSK0-legacy.desktop
index 140b417..1847c84 100644
--- a/default/sm.puri.OSK0.desktop
+++ b/default/sm.puri.OSK0-legacy.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=On-screen keyboard
-Comment=Default on-screen keyboard
+Comment=Legacy on-screen keyboard wrapper
Exec=/usr/bin/osk-wayland
Categories=GNOME;Core;
OnlyShowIn=GNOME;
--
GitLab