daandemeyer / rpms / systemd

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