rpms/kbd/devel kbd-1.12-trq-map.patch,NONE,1.1 kbd.spec,1.53,1.54

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/kbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12765

Modified Files:
	kbd.spec 
Added Files:
	kbd-1.12-trq-map.patch 
Log Message:
Fix trq.map

kbd-1.12-trq-map.patch:

--- NEW FILE kbd-1.12-trq-map.patch ---
diff -up kbd-1.12/data/keymaps/i386/qwerty/trq.map_old kbd-1.12/data/keymaps/i386/qwerty/trq.map
--- kbd-1.12/data/keymaps/i386/qwerty/trq.map_old	2002-10-11 13:08:49.000000000 +0200
+++ kbd-1.12/data/keymaps/i386/qwerty/trq.map	2008-02-26 12:04:16.000000000 +0100
@@ -1,5 +1,5 @@
 charset "iso-8859-9"
-keymaps 0-6,8-9,12
+keymaps 0-6,8-14
 include "linux-with-alt-and-altgr"
 strings as usual
 
@@ -8,80 +8,86 @@ keycode   1 = Escape
 keycode   2 = one exclam
 	alt       keycode   2 = Meta_one
 	alt shift keycode   2 = Meta_exclam
-keycode   3 = two apostrophe
-	control   keycode   3 = nul
-	control shift keycode 3 = nul
+keycode   3 = two apostrophe sterling
 	alt       keycode   3 = Meta_two
 	alt shift keycode   3 = Meta_apostrophe
 keycode   4 = three asciicircum numbersign
-	control   keycode   4 = Escape
+	control shift keycode   4 = Control_asciicircum
 	alt       keycode   4 = Meta_three
 	alt shift keycode   4 = Meta_asciicircum
+	alt altgr keycode   4 = Meta_numbersign
+	alt control shift keycode   4 = Meta_Control_asciicircum
 keycode   5 = four plus dollar
-	control   keycode   5 = Control_backslash
 	alt       keycode   5 = Meta_four
 	alt shift keycode   5 = Meta_plus
-keycode   6 = five percent
-	control   keycode   6 = Control_bracketright
+	alt altgr keycode   5 = Meta_dollar
+keycode   6 = five percent onehalf
 	alt       keycode   6 = Meta_five
 	alt shift keycode   6 = Meta_percent
 keycode   7 = six ampersand
-	control   keycode   7 = Control_asciicircum
 	alt       keycode   7 = Meta_six
 	alt shift keycode   7 = Meta_ampersand
 keycode   8 = seven slash braceleft
-	control   keycode   8 = Control_underscore
 	alt       keycode   8 = Meta_seven
 	alt shift keycode   8 = Meta_slash
+	alt altgr keycode   8 = Meta_braceleft
 keycode   9 = eight parenleft bracketleft
-	control   keycode   9 = Delete
 	alt       keycode   9 = Meta_eight
 	alt shift keycode   9 = Meta_parenleft
+	alt altgr keycode   9 = Meta_bracketleft
 keycode  10 = nine parenright bracketright
+	control altgr keycode  10 = Control_bracketright
 	alt       keycode  10 = Meta_nine
 	alt shift keycode  10 = Meta_parenright
+	alt altgr keycode  10 = Meta_bracketright
+	alt control altgr keycode  10 = Meta_Control_bracketright
 keycode  11 = zero equal braceright
 	alt       keycode  11 = Meta_zero
 	alt shift keycode  11 = Meta_equal
+	alt altgr keycode  11 = Meta_braceright
 keycode  12 = asterisk question backslash
-	control   keycode  12 = Control_underscore
-	control shift keycode 12 = Control_underscore
+	control altgr keycode 12 = Control_backslash
 	alt       keycode  12 = Meta_asterisk
 	alt shift keycode  12 = Meta_question
+	alt altgr keycode  12 = Meta_backslash
+	alt control altgr keycode 12 = Meta_Control_backslash
 keycode  13 = minus underscore
+	control shift keycode 13 = Control_underscore
 	alt       keycode  13 = Meta_minus
 	alt shift keycode  13 = Meta_underscore
+	alt control shift keycode 13 = Meta_Control_underscore
 keycode  14 = Delete
 	alt       keycode  14 = Meta_Delete
 keycode  15 = Tab
 	alt       keycode  15 = Meta_Tab
 keycode  16 = q
 	altgr keycode 16 = at
+	alt altgr keycode 16 = Meta_at
 keycode  17 = w
 keycode  18 = e
+	altgr keycode 18 = euro
 keycode  19 = r
 keycode  20 = t
 keycode  21 = y
 keycode  22 = u
-	altgr keycode 22 = +0373
-	altgr shift keycode 22 = +0333
-keycode  23 = +0375 +I
-	altgr keycode 23 = +0356
-	altgr shift keycode 23 = +0316
+	altgr keycode 22 = +ucircumflex
+	altgr shift keycode 22 = +Ucircumflex
+keycode  23 = +dotlessi +I
+	altgr keycode 23 = +icircumflex
+	altgr shift keycode 23 = +Icircumflex
 keycode  24 = o
-	altgr keycode 24 = +0364
-	altgr shift keycode 24 = +0324
+	altgr keycode 24 = +ocircumflex
+	altgr shift keycode 24 = +Ocircumflex
 keycode  25 = p
-keycode  26 = +0360 +0320
-	control   keycode  26 = Escape
-keycode  27 = +0374 +0334 asciitilde
-	control   keycode  27 = Control_bracketright
+keycode  26 = +gbreve +Gbreve diaeresis
+keycode  27 = +udiaeresis +Udiaeresis asciitilde
+	alt altgr keycode  27 = Meta_asciitilde
 keycode  28 = Return
 	alt       keycode  28 = 0x080d
 keycode  29 = Control
 keycode  30 = a
-	altgr keycode 30 = +0342
-	altgr shift keycode 30 = +0302
+	altgr keycode 30 = +acircumflex
+	altgr shift keycode 30 = +Acircumflex
 keycode  31 = s
 keycode  32 = d
 keycode  33 = f
@@ -90,17 +96,15 @@ keycode  35 = h
 keycode  36 = j
 keycode  37 = k
 keycode  38 = l
-keycode  39 = +0376 +0336
-keycode  40 = +i +0335
-	control   keycode  40 = Control_g
+keycode  39 = +scedilla +Scedilla acute
+keycode  40 = +i +Idotabove
 keycode  41 = quotedbl eacute
-	control   keycode  41 = nul
 	alt       keycode  41 = Meta_quotedbl
 keycode  42 = Shift
 keycode  43 = comma semicolon grave
-	control   keycode  43 = Control_backslash
 	alt       keycode  43 = Meta_comma
 	alt shift keycode  43 = Meta_semicolon
+	alt altgr keycode  43 = Meta_grave
 keycode  44 = z
 keycode  45 = x
 keycode  46 = c
@@ -108,10 +112,9 @@ keycode  47 = v
 keycode  48 = b
 keycode  49 = n
 keycode  50 = m
-keycode  51 = +0366 +0326
-keycode  52 = +0347 +0307
-keycode  53 = period colon slash
-	control   keycode  53 = Delete
+keycode  51 = +odiaeresis +Odiaeresis
+keycode  52 = +ccedilla +Ccedilla
+keycode  53 = period colon
 	alt       keycode  53 = Meta_period
 	alt shift keycode  53 = Meta_colon
 keycode  54 = Shift
@@ -119,6 +122,7 @@ keycode  56 = Alt
 keycode  57 = space
 	control   keycode  57 = nul
 	alt       keycode  57 = Meta_space
+	alt control keycode  57 = Meta_nul
 keycode  58 = Caps_Lock
 keycode  86 = less greater bar
 	alt       keycode  86 = Meta_less


Index: kbd.spec
===================================================================
RCS file: /cvs/extras/rpms/kbd/devel/kbd.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- kbd.spec	22 Feb 2008 09:58:17 -0000	1.53
+++ kbd.spec	26 Feb 2008 11:11:43 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Name: kbd
 Version: 1.12
-Release: 30%{?dist}
+Release: 31%{?dist}
 # Except possibly for the restrictions mentioned in the directory consolefonts
 License: GPL+
 Group: System Environment/Base
@@ -27,6 +27,7 @@
 Patch10: kbd-1.12-gr-el.patch
 Patch11: kbd-1.12-keycodes-man.patch
 Patch12: kbd-1.12-resizecon-x86.patch
+Patch13: kbd-1.12-trq-map.patch
 Obsoletes: console-tools open
 Provides: console-tools open
 Conflicts: util-linux < 2.11r-9
@@ -53,6 +54,7 @@
 %patch10 -p1 -b .gr-el
 %patch11 -p1 -b .keycodes-man
 %patch12 -p1 -b .resizecon-x86
+%patch13 -p1 -b .trq-map
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -127,6 +129,10 @@
 /lib/kbd
 
 %changelog
+* Tue Feb 26 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.12-31
+- Fix trq.map
+  Resolves: #216710
+
 * Fri Feb 22 2008 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.12-30
 - Rebuild fo GCC 4.3