|
 |
a52f674 |
From 5abb54b9398799f83f7df303b5da85a8e59d6bb9 Mon Sep 17 00:00:00 2001
|
|
|
b12ff75 |
From: Adam Williamson <awilliam@redhat.com>
|
|
|
b12ff75 |
Date: Mon, 9 Dec 2013 21:58:34 -0800
|
|
|
b12ff75 |
Subject: [PATCH] drop several entries from kbd-model-map whose kbd layouts do
|
|
|
b12ff75 |
not exist
|
|
|
b12ff75 |
|
|
|
b12ff75 |
kbd-model-map was generated from system-config-keyboard's keyboard_models.py.
|
|
|
b12ff75 |
Several of the kbd layouts referred in that file do not exist and, so far as I
|
|
|
b12ff75 |
can tell, never did. I believe these entries existed simply to provide the xkb
|
|
|
b12ff75 |
configuration information for those layouts, and there never were matching kbd
|
|
|
b12ff75 |
entries; the kbd names were entirely notional, to satisfy the need for some
|
|
|
b12ff75 |
entry or other in that field.
|
|
|
b12ff75 |
|
|
|
b12ff75 |
For systemd, the only function of kbd-model-map is to 'match' kbd and xkb
|
|
|
b12ff75 |
configurations, so it does not make any sense to maintain entries for cases
|
|
|
b12ff75 |
where only one or the other exists in this context.
|
|
|
a52f674 |
|
|
|
a52f674 |
(cherry picked from commit 70dc36d17fbd81eead01fb73cc231c83c6d977e9)
|
|
|
b12ff75 |
---
|
|
|
b12ff75 |
src/locale/kbd-model-map | 12 ------------
|
|
|
b12ff75 |
1 file changed, 12 deletions(-)
|
|
|
b12ff75 |
|
|
|
b12ff75 |
diff --git a/src/locale/kbd-model-map b/src/locale/kbd-model-map
|
|
|
b12ff75 |
index 1fe9bca..78c7887 100644
|
|
|
b12ff75 |
--- a/src/locale/kbd-model-map
|
|
|
b12ff75 |
+++ b/src/locale/kbd-model-map
|
|
|
b12ff75 |
@@ -4,22 +4,18 @@ sg ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
nl nl pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
mk-utf mk,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
trq tr pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
-guj in,us pc105 guj terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
uk gb pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
is-latin1 is pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
de de pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
-gur gur,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
la-latin1 latam pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
us us pc105+inet - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
ko kr pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
ro-std ro pc105 std terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
de-latin1 de pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
-tml-inscript in,us pc105 tam terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
slovene si pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
hu101 hu pc105 qwerty terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
jp106 jp jp106 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
croat hr pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
-ben-probhat in,us pc105 ben_probhat terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
fi-latin1 fi pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
it2 it pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
hu hu pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
@@ -29,7 +25,6 @@ fr_CH ch pc105 fr terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
dk-latin1 dk pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
fr fr pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
it it pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
-tml-uni in,us pc105 tam_TAB terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
ua-utf ua,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
fr-latin1 fr pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
sg-latin1 ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
@@ -39,16 +34,12 @@ fr-pc fr pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
bg_pho-utf8 bg,us pc105 ,phonetic terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
it-ibm it pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
cz-us-qwertz cz,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
-ar-digits ara,us pc105 digits terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
br-abnt2 br abnt2 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
ro ro pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
us-acentos us pc105 intl terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
pt-latin1 pt pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
ro-std-cedilla ro pc105 std_cedilla terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
tj tj pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
-ar-qwerty ara,us pc105 qwerty terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
-ar-azerty-digits ara,us pc105 azerty_digits terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
-ben in,us pc105 ben terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
de-latin1-nodeadkeys de pc105 nodeadkeys terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
no no pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
bg_bds-utf8 bg,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
@@ -60,11 +51,8 @@ pl2 pl pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
es es pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
ro-cedilla ro pc105 cedilla terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
ie ie pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
-ar-azerty ara,us pc105 azerty terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
-ar-qwerty-digits ara,us pc105 qwerty_digits terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
et ee pc105 - terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
sk-qwerty sk pc105 - terminate:ctrl_alt_bksp,qwerty
|
|
|
b12ff75 |
-dev dev,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll
|
|
|
b12ff75 |
fr-latin9 fr pc105 latin9 terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
fr_CH-latin1 ch pc105 fr terminate:ctrl_alt_bksp
|
|
|
b12ff75 |
cf ca pc105 - terminate:ctrl_alt_bksp
|