data/org.ayatana.indicator.keyboard | 3 1 + 2 - 0 !
1 file changed, 1 insertion(+), 2 deletions(-)

 [patch] try to place the indicator in the leftmost position by
 default

This seems to have been the intention in commit
d2758a873a848fc4113a4087d53446f73c6543cb.

data/org.ayatana.indicator.keyboard.gschema.xml | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 show the keyboard icon (instead of the language icon) by default in debian.

src/keyboard-lomiri.c | 9 7 + 2 - 0 !
src/keyboard-x11.c | 13 10 + 3 - 0 !
src/keyboard.h | 4 2 + 2 - 0 !
src/service.c | 20 15 + 5 - 0 !
4 files changed, 34 insertions(+), 12 deletions(-)

 [patch 1/2] fix showing current layout on lomiri

Just like GNOME did, we are switching to tecla here, since gkbd-keyboard-display does not work under Wayland.

fixes https://github.com/AyatanaIndicators/ayatana-indicator-keyboard/issues/76

CMakeLists.txt | 3 2 + 1 - 0 !
src/keyboard-lomiri.c | 346 341 + 5 - 0 !
src/keyboard-x11.c | 16 13 + 3 - 0 !
src/keyboard.h | 8 5 + 3 - 0 !
src/service.c | 189 165 + 24 - 0 !
5 files changed, 526 insertions(+), 36 deletions(-)

 [patch 3/7] separate layout and settings for hardware and on-screen
 keyboards

Refurbished by Mike Gabriel, avoiding white-space changes, variable renamings and internal code block moves.

Fixes: https://salsa.debian.org/ubports-team/lomiri-system-settings/-/issues/20
Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

src/keyboard-lomiri.c | 26 20 + 6 - 0 !
src/keyboard-x11.c | 3 2 + 1 - 0 !
src/keyboard.h | 2 1 + 1 - 0 !
3 files changed, 23 insertions(+), 8 deletions(-)

 [patch 4/7] src/keyboard*: remember nlayout and nlayoutosk
 separately.

Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

src/keyboard-lomiri.c | 51 46 + 5 - 0 !
1 file changed, 46 insertions(+), 5 deletions(-)

 [patch 5/7] src/keyboard-lomiri.c: for osk layouts, update
 'enabled-languages' gsettings and move the newly selected 'active-language'
 to the top.

Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

src/service.c | 45 11 + 34 - 0 !
1 file changed, 11 insertions(+), 34 deletions(-)

 [patch 6/7] src/service.c: move 'show current layout' menuitem closer
 HWK settings (i.e. drop one menu separator).

Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

src/service.c | 5 3 + 2 - 0 !
1 file changed, 3 insertions(+), 2 deletions(-)

 [patch 7/7] src/service.c: don't show osk settings when on ubuntu
 Touch.

Signed-off-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>