rpms/xkeyboard-config/devel olpc-xkeyboard-config-kz-group.patch, 1.2, 1.3 usinet.patch, 1.2, 1.3 xkeyboard-config-1.4-battery.patch, 1.1, 1.2 xkeyboard-config-1.4-jp-tilde.patch, 1.1, 1.2 xkeyboard-config-1.4-tj-variant.patch, 1.1, 1.2 xkeyboard-config.spec, 1.28, 1.29 olpc-xkeyboard-config-af.patch, 1.1, NONE olpc-xkeyboard-config-ng-group.patch, 1.1, NONE olpc-xkeyboard-config-ng-h.patch, 1.1, NONE xkeyboard-config-1.3-AC11-mapping-is.patch, 1.1, NONE
Peter Hutterer
whot at fedoraproject.org
Mon Nov 24 03:56:57 UTC 2008
- Previous message (by thread): rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.60, 1.61 kernel.spec, 1.1158, 1.1159
- Next message (by thread): rpms/vala/F-9 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 vala.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: whot
Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2301
Modified Files:
olpc-xkeyboard-config-kz-group.patch usinet.patch
xkeyboard-config-1.4-battery.patch
xkeyboard-config-1.4-jp-tilde.patch
xkeyboard-config-1.4-tj-variant.patch xkeyboard-config.spec
Removed Files:
olpc-xkeyboard-config-af.patch
olpc-xkeyboard-config-ng-group.patch
olpc-xkeyboard-config-ng-h.patch
xkeyboard-config-1.3-AC11-mapping-is.patch
Log Message:
* Mon Nov 24 2008 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-7
- Switch to using git patches, modelled after xorg-x11-server.
- CVS remove unused patches.
olpc-xkeyboard-config-kz-group.patch:
Index: olpc-xkeyboard-config-kz-group.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/olpc-xkeyboard-config-kz-group.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- olpc-xkeyboard-config-kz-group.patch 7 Feb 2008 17:36:24 -0000 1.2
+++ olpc-xkeyboard-config-kz-group.patch 24 Nov 2008 03:56:27 -0000 1.3
@@ -1,3 +1,10 @@
+From ca3dcd5cf50ccb0ffadd8308a7132a14993b16bc Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x at fedoraproject.org>
+Date: Mon, 24 Nov 2008 13:01:22 +1000
+Subject: [PATCH] OLPC: map group switching to I219 in symbols(kz)
+
+
+---
diff -up xkeyboard-config-1.2/symbols/kz.kzgroup xkeyboard-config-1.2/symbols/kz
--- xkeyboard-config-1.2/symbols/kz.kzgroup 2008-01-24 18:21:06.000000000 -0500
+++ xkeyboard-config-1.2/symbols/kz 2008-02-07 12:23:56.000000000 -0500
usinet.patch:
Index: usinet.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/usinet.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- usinet.patch 15 Apr 2008 02:50:37 -0000 1.2
+++ usinet.patch 24 Nov 2008 03:56:27 -0000 1.3
@@ -1,7 +1,18 @@
-diff -up xkeyboard-config-1.2/rules/base.lists.part.usinet xkeyboard-config-1.2/rules/base.lists.part
---- xkeyboard-config-1.2/rules/base.lists.part.usinet 2008-01-11 17:19:47.000000000 -0500
-+++ xkeyboard-config-1.2/rules/base.lists.part 2008-04-14 22:47:19.000000000 -0400
-@@ -52,6 +52,7 @@
+From f6b527515a6eb088c7ff6eb66bda454e20df371e Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x at fedoraproject.org>
+Date: Mon, 24 Nov 2008 13:10:56 +1000
+Subject: [PATCH] Add include inet(media_nav_common) by default for pc105
+
+---
+ rules/base.lists.part | 1 +
+ symbols/inet | 6 ++++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/rules/base.lists.part b/rules/base.lists.part
+index b08ab24..f9207b6 100644
+--- a/rules/base.lists.part
++++ b/rules/base.lists.part
+@@ -53,6 +53,7 @@
microsoftoffice microsoftmult \
mx1998 mx2500 mx2750 \
oretec \
@@ -9,10 +20,11 @@
presario propeller \
qtronix \
rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
-diff -up xkeyboard-config-1.2/symbols/inet.usinet xkeyboard-config-1.2/symbols/inet
---- xkeyboard-config-1.2/symbols/inet.usinet 2008-01-07 18:07:51.000000000 -0500
-+++ xkeyboard-config-1.2/symbols/inet 2008-04-14 22:48:23.000000000 -0400
-@@ -2211,3 +2211,9 @@ xkb_symbols "classmate" {
+diff --git a/symbols/inet b/symbols/inet
+index 54ec241..568cc4a 100644
+--- a/symbols/inet
++++ b/symbols/inet
+@@ -2234,3 +2234,9 @@ xkb_symbols "classmate" {
key <I30> { [ XF86AudioRaiseVolume ] };
};
@@ -22,3 +34,6 @@
+xkb_symbols "pc105" {
+ include "inet(media_nav_common)"
+};
+--
+1.6.0.3
+
xkeyboard-config-1.4-battery.patch:
Index: xkeyboard-config-1.4-battery.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config-1.4-battery.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeyboard-config-1.4-battery.patch 24 Oct 2008 04:28:23 -0000 1.1
+++ xkeyboard-config-1.4-battery.patch 24 Nov 2008 03:56:27 -0000 1.2
@@ -1,6 +1,16 @@
-diff -up xkeyboard-config-1.4/symbols/inet.orig xkeyboard-config-1.4/symbols/inet
---- xkeyboard-config-1.4/symbols/inet.orig 2008-10-24 11:49:36.000000000 +1030
-+++ xkeyboard-config-1.4/symbols/inet 2008-10-24 11:49:52.000000000 +1030
+From ca3dcd5cf50ccb0ffadd8308a7132a14993b16bc Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x at fedoraproject.org>
+Date: Mon, 24 Nov 2008 13:01:22 +1000
+Subject: [PATCH] Map KEY_BATTERY, WLAN, BLUETOOTH, UWB to their XF86<...> keycodes.
+
+---
+ symbols/inet | 7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/symbols/inet b/symbols/inet
+index 54ec241..50b559b 100644
+--- a/symbols/inet
++++ b/symbols/inet
@@ -158,9 +158,10 @@ xkb_symbols "evdev" {
key <I241> { [ XF86MailForward ] };
key <I242> { [ XF86Save ] };
@@ -15,3 +25,6 @@
// key <I249> { [ ] }; // KEY_VIDEO_NEXT -- drive next video source
// key <I250> { [ ] }; // KEY_VIDEO_PREV -- drive previous video source
// key <I251> { [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min
+--
+1.6.0.3
+
xkeyboard-config-1.4-jp-tilde.patch:
Index: xkeyboard-config-1.4-jp-tilde.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config-1.4-jp-tilde.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeyboard-config-1.4-jp-tilde.patch 12 Nov 2008 23:27:47 -0000 1.1
+++ xkeyboard-config-1.4-jp-tilde.patch 24 Nov 2008 03:56:27 -0000 1.2
@@ -1,6 +1,17 @@
-diff -up xkeyboard-config-1.4/symbols/jp.orig xkeyboard-config-1.4/symbols/jp
---- xkeyboard-config-1.4/symbols/jp.orig 2008-11-11 11:19:41.000000000 +1000
-+++ xkeyboard-config-1.4/symbols/jp 2008-11-11 11:37:53.000000000 +1000
+From 824ce3a400a452929f90a038033c83055c01a2d7 Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x at fedoraproject.org>
+Date: Mon, 24 Nov 2008 12:59:09 +1000
+Subject: [PATCH] Map TLDE to Zenkaku/Hankaku in jp, and BKSL to bracket/brace right (#469537).
+
+This patch is only needed for jp on a non-jp106 keyboard model.
+---
+ symbols/jp | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/symbols/jp b/symbols/jp
+index 694090c..ef0b0f7 100644
+--- a/symbols/jp
++++ b/symbols/jp
@@ -24,6 +24,13 @@ xkb_symbols "common" {
symbols[Group1]= [ Zenkaku_Hankaku, Kanji ]
};
@@ -15,3 +26,6 @@
key <AE01> { [ 1, exclam ] };
key <AE02> { [ 2, quotedbl ] };
key <AE03> { [ 3, numbersign ] };
+--
+1.6.0.3
+
xkeyboard-config-1.4-tj-variant.patch:
Index: xkeyboard-config-1.4-tj-variant.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config-1.4-tj-variant.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeyboard-config-1.4-tj-variant.patch 15 Oct 2008 03:10:15 -0000 1.1
+++ xkeyboard-config-1.4-tj-variant.patch 24 Nov 2008 03:56:27 -0000 1.2
@@ -1,8 +1,18 @@
+From 39107a296f89fc61ede5b88ba97e9d6eb311c004 Mon Sep 17 00:00:00 2001
+From: Fedora X Ninjas <x at fedoraproject.org>
+Date: Mon, 24 Nov 2008 13:06:10 +1000
+Subject: [PATCH] Add legacy and basic tj layouts (#455796)
+
+---
+ rules/base.xml.in | 9 ++-
+ symbols/tj | 197 ++++++++++++++++++++++++++++++++++------------------
+ 2 files changed, 137 insertions(+), 69 deletions(-)
+
diff --git a/rules/base.xml.in b/rules/base.xml.in
-index 5040879..5b12f9f 100644
+index 8d0aa92..1fefc62 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
-@@ -3594,7 +3594,20 @@ i </variant>
+@@ -3580,7 +3580,14 @@
<_description>Tajikistan</_description>
<languageList><iso639Id>tgk</iso639Id></languageList>
</configItem>
@@ -10,12 +20,6 @@
+ <variantList>
+ <variant>
+ <configItem>
-+ <name>std</name>
-+ <_description>Standard</_description>
-+ </configItem>
-+ </variant>
-+ <variant>
-+ <configItem>
+ <name>legacy</name>
+ <_description>Legacy</_description>
+ </configItem>
@@ -25,13 +29,23 @@
<layout>
<configItem>
diff --git a/symbols/tj b/symbols/tj
-index f07b290..d9e5ff6 100644
+index f07b290..a72b18d 100644
--- a/symbols/tj
+++ b/symbols/tj
-@@ -76,3 +76,140 @@ xkb_symbols "basic" {
- // End alphanumeric section
+@@ -1,78 +1,139 @@
+ // $XKeyboardConfig$
- };
+-// based on
+-// Tajik keyboard
+-// it is a Russian layout keyboard, with SHCHA replaced with
+-// dead_cedilla/dead_macron
+-// that allows to type the SHCHA with dead_cedilla + SHA
+-// and all the extra Tajik keys:
+-// dead_cedilla + KA, HA --> KA descender, HA descender
+-// dead_macron + I, U, GHE --> I macron, U macron, GHE horizontal stroke
+-// it requires proper dead_cedilla and dead_macron entries in Compose file
+-// it also allows to use Mode_switch when in cyrillic mode to enter
+-// special letters by doing Mode_switch + base letter
+// 17/07/2008
+// -------------------------------------------------------------
+// Standard Tojiki Keyboard Layout, Official Standard
@@ -43,66 +57,75 @@
+// --------------------------------------------------------------------
+// -------------- Tajiki Official Keyboard Layout----------------------
+// --------------------------------------------------------------------
-+//
-+
-+partial alphanumeric_keys
-+xkb_symbols "std"
+ //
+-// AEN <aen at logic.ru> (for the Russian layout)
+-// Pablo Saratxaga <pablo at mandrakesoft> (for the dead keys changes)
+-//
+-// 2008-06-22
+-// Changed so that RightAlt allows to type the extra Tajik keys and that
+-// SHCHA is back to normal again
+
++partial default alphanumeric_keys
++xkb_symbols "basic"
+{
-+ name[Group1] = "Tajikistan - Standard";
++ name[Group1] = "Tajikistan";
+
-+ include "keypad(comma)"
++ include "keypad(comma)"
+ include "level3(ralt_switch)"
-+
-+ key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; // Ñ Ð¯
-+ key <AB02> { [ Cyrillic_che, Cyrillic_CHE ] }; // ч Ч
-+ key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; // Ñ Ð¡
-+ key <AB04> { [ Cyrillic_em, Cyrillic_EM ] }; // м М
-+ key <AB05> { [ Cyrillic_i, Cyrillic_I ] }; // и И
-+ key <AB06> { [ Cyrillic_te, Cyrillic_TE ] }; // т Т
-+ key <AB07> { [ 0x10004e3, 0x10004e2 ] }; // Ó£ Ó¢
-+ key <AB08> { [ Cyrillic_be, Cyrillic_BE ] }; // б Б
-+ key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] }; // ю Ю
-+ key <AB10> { [ period, comma ] }; // . ,
-+ key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] }; // ф Ф
-+ key <AC02> { [ 0x10004b7, 0x10004b6 ] }; // Ò· Ò¶
-+ key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] }; // в В
-+ key <AC04> { [ Cyrillic_a, Cyrillic_A ] }; // а Ð
-+ key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] }; // п П
-+ key <AC06> { [ Cyrillic_er, Cyrillic_ER ] }; // Ñ€ Ð
-+ key <AC07> { [ Cyrillic_o, Cyrillic_O ] }; // о О
-+ key <AC08> { [ Cyrillic_el, Cyrillic_EL ] }; // л Л
-+ key <AC09> { [ Cyrillic_de, Cyrillic_DE ] }; // д Д
-+ key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // ж Ж
-+ key <AC11> { [ Cyrillic_e, Cyrillic_E ] }; // Ñ Ð
-+ key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // й Й
-+ key <AD02> { [ 0x100049b, 0x100049a ] }; // Ò› Òš
-+ key <AD03> { [ Cyrillic_u, Cyrillic_U ] }; // у У
-+ key <AD04> { [ Cyrillic_ka, Cyrillic_KA ] }; // к К
-+ key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] }; // е Е
-+ key <AD06> { [ Cyrillic_en, Cyrillic_EN ] }; // н Ð
-+ key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE ] }; // г Г
-+ key <AD08> { [ Cyrillic_sha, Cyrillic_SHA ] }; // ш Ш
-+ key <AD09> { [ 0x10004b3, 0x10004b2 ] }; // Ò³ Ò²
-+ key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] }; // з З
-+ key <AD11> { [ Cyrillic_ha, Cyrillic_HA ] }; // х Х
-+ key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; // ъ Ъ
-+ key <AE01> { [ 1, exclam, 0x10000a7 ] }; // 1 ! §
-+ key <AE02> { [ 2, quotedbl, 0x10000ab, 0x10000bb ] }; // 2 " « »
-+ key <AE03> { [ 3, numerosign ] }; // 3 â„–
-+ key <AE04> { [ 4, semicolon ] }; // 4 ;
-+ key <AE05> { [ 5, percent ] }; // 5 %
-+ key <AE06> { [ 6, colon, 0x1002013 ] }; // 6 : –
-+ key <AE07> { [ 7, question, ampersand ] }; // 7 ? &
-+ key <AE08> { [ 8, asterisk ] }; // 8 *
-+ key <AE09> { [ 9, parenleft ] }; // 9 (
-+ key <AE10> { [ 0, parenright, 0x10000b0 ] }; // 0 ) °
-+ key <AE11> { [ 0x1000493, 0x1000492, minus, underscore ] }; // Ò“ Ò’ - _
-+ key <AE12> { [ 0x10004ef, 0x10004ee, equal, plus ] }; // Ó¯ Ó® = +
-+ key <BKSL> { [ backslash, slash ] }; // \ /
-+ key <LSGT> { [ slash, bar ] }; // / |
-+ key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; // Ñ‘ Ð
+
+-partial default alphanumeric_keys
+-xkb_symbols "basic" {
++ key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; // Ñ Ð¯
++ key <AB02> { [ Cyrillic_che, Cyrillic_CHE ] }; // ч Ч
++ key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; // Ñ Ð¡
++ key <AB04> { [ Cyrillic_em, Cyrillic_EM ] }; // м М
++ key <AB05> { [ Cyrillic_i, Cyrillic_I ] }; // и И
++ key <AB06> { [ Cyrillic_te, Cyrillic_TE ] }; // т Т
++ key <AB07> { [ 0x10004e3, 0x10004e2 ] }; // Ó£ Ó¢
++ key <AB08> { [ Cyrillic_be, Cyrillic_BE ] }; // б Б
++ key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] }; // ю Ю
++ key <AB10> { [ period, comma ] }; // . ,
++ key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] }; // ф Ф
++ key <AC02> { [ 0x10004b7, 0x10004b6 ] }; // Ò· Ò¶
++ key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] }; // в В
++ key <AC04> { [ Cyrillic_a, Cyrillic_A ] }; // а Ð
++ key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] }; // п П
++ key <AC06> { [ Cyrillic_er, Cyrillic_ER ] }; // Ñ€ Ð
++ key <AC07> { [ Cyrillic_o, Cyrillic_O ] }; // о О
++ key <AC08> { [ Cyrillic_el, Cyrillic_EL ] }; // л Л
++ key <AC09> { [ Cyrillic_de, Cyrillic_DE ] }; // д Д
++ key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // ж Ж
++ key <AC11> { [ Cyrillic_e, Cyrillic_E ] }; // Ñ Ð
++ key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // й Й
++ key <AD02> { [ 0x100049b, 0x100049a ] }; // Ò› Òš
++ key <AD03> { [ Cyrillic_u, Cyrillic_U ] }; // у У
++ key <AD04> { [ Cyrillic_ka, Cyrillic_KA ] }; // к К
++ key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] }; // е Е
++ key <AD06> { [ Cyrillic_en, Cyrillic_EN ] }; // н Ð
++ key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE ] }; // г Г
++ key <AD08> { [ Cyrillic_sha, Cyrillic_SHA ] }; // ш Ш
++ key <AD09> { [ 0x10004b3, 0x10004b2 ] }; // Ò³ Ò²
++ key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] }; // з З
++ key <AD11> { [ Cyrillic_ha, Cyrillic_HA ] }; // х Х
++ key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; // ъ Ъ
++ key <AE01> { [ 1, exclam, 0x10000a7 ] }; // 1 ! §
++ key <AE02> { [ 2, quotedbl, 0x10000ab, 0x10000bb ] }; // 2 " « »
++ key <AE03> { [ 3, numerosign ] }; // 3 â„–
++ key <AE04> { [ 4, semicolon ] }; // 4 ;
++ key <AE05> { [ 5, percent ] }; // 5 %
++ key <AE06> { [ 6, colon, 0x1002013 ] }; // 6 : –
++ key <AE07> { [ 7, question, ampersand ] }; // 7 ? &
++ key <AE08> { [ 8, asterisk ] }; // 8 *
++ key <AE09> { [ 9, parenleft ] }; // 9 (
++ key <AE10> { [ 0, parenright, 0x10000b0 ] }; // 0 ) °
++ key <AE11> { [ 0x1000493, 0x1000492, minus, underscore ] }; // Ò“ Ò’ - _
++ key <AE12> { [ 0x10004ef, 0x10004ee, equal, plus ] }; // Ó¯ Ó® = +
++ key <BKSL> { [ backslash, slash ] }; // \ /
++ key <LSGT> { [ slash, bar ] }; // / |
++ key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; // Ñ‘ Ð
+};
-+
+
+- name[Group1]= "Tajikistan";
+// --------------------------------------------------------------------
+// -------------- Tojiki Rusi Keyboard Layout--------------------------
+// --------------------------------------------------------------------
@@ -111,113 +134,7 @@
+// 2005/12/09 Valery Inozemtsev <shrek at altlinux.ru>
+// Pablo Saratxaga <pablo at mandrakesoft> (for the dead keys changes)
+// --------------------------------------------------------------------
-+
-+xkb_symbols "legacy"
-+{
-+ name[Group1] = "Tajikistan - Legacy";
-+
-+ include "keypad(comma)"
-+ include "level3(ralt_switch)"
-+
-+ key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; // Ñ Ð¯
-+ key <AB02> { [ Cyrillic_che, Cyrillic_CHE, 0x10004b7, 0x10004b6 ] }; // ч Ч ҷ Ҷ
-+ key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; // Ñ Ð¡
-+ key <AB04> { [ Cyrillic_em, Cyrillic_EM ] }; // м М
-+ key <AB05> { [ Cyrillic_i, Cyrillic_I, 0x10004e3, 0x10004e2 ] }; // и И ӣ Ӣ
-+ key <AB06> { [ Cyrillic_te, Cyrillic_TE ] }; // т Т
-+ key <AB07> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; // ь Ь
-+ key <AB08> { [ Cyrillic_be, Cyrillic_BE ] }; // б Б
-+ key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] }; // ю Ю
-+ key <AB10> { [ period, comma ] }; // . ,
-+ key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] }; // ф Ф
-+ key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU ] }; // ы Ы
-+ key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] }; // в В
-+ key <AC04> { [ Cyrillic_a, Cyrillic_A ] }; // а Ð
-+ key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] }; // п П
-+ key <AC06> { [ Cyrillic_er, Cyrillic_ER ] }; // Ñ€ Ð
-+ key <AC07> { [ Cyrillic_o, Cyrillic_O ] }; // о О
-+ key <AC08> { [ Cyrillic_el, Cyrillic_EL ] }; // л Л
-+ key <AC09> { [ Cyrillic_de, Cyrillic_DE ] }; // д Д
-+ key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // ж Ж
-+ key <AC11> { [ Cyrillic_e, Cyrillic_E ] }; // Ñ Ð
-+ key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // й Й
-+ key <AD02> { [ Cyrillic_tse, Cyrillic_TSE ] }; // ц Ц
-+ key <AD03> { [ Cyrillic_u, Cyrillic_U, 0x10004ef, 0x10004ee ] }; // у У ӯ Ӯ
-+ key <AD04> { [ Cyrillic_ka, Cyrillic_KA, 0x100049b, 0x100049a ] }; // к К қ Қ
-+ key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] }; // е Е
-+ key <AD06> { [ Cyrillic_en, Cyrillic_EN ] }; // н Ð
-+ key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE, 0x1000493, 0x1000492 ] }; // г Г ғ Ғ
-+ key <AD08> { [ Cyrillic_sha, Cyrillic_SHA ] }; // ш Ш
-+ key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; // щ Щ
-+ key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] }; // з З
-+ key <AD11> { [ Cyrillic_ha, Cyrillic_HA, 0x10004b3, 0x10004b2 ] }; // х Х ҳ Ҳ
-+ key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; // ъ Ъ
-+ key <AE01> { [ 1, exclam, 0x10000a7 ] }; // 1 ! §
-+ key <AE02> { [ 2, quotedbl, 0x10000ab, 0x10000bb ] }; // 2 " « »
-+ key <AE03> { [ 3, numerosign ] }; // 3 â„–
-+ key <AE04> { [ 4, semicolon ] }; // 4 ;
-+ key <AE05> { [ 5, percent ] }; // 5 %
-+ key <AE06> { [ 6, colon, 0x1002013 ] }; // 6 : –
-+ key <AE07> { [ 7, question, ampersand ] }; // 7 ? &
-+ key <AE08> { [ 8, asterisk ] }; // 8 *
-+ key <AE09> { [ 9, parenleft ] }; // 9 (
-+ key <AE10> { [ 0, parenright ] }; // 0 )
-+ key <AE11> { [ minus, underscore ] }; // - _
-+ key <AE12> { [ equal, plus ] }; // = +
-+ key <BKSL> { [ backslash, slash ] }; // \ /
-+ key <LSGT> { [ slash, bar ] }; // / |
-+ key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; // Ñ‘ Ð
-+};
-+
-diff --git a/rules/base.xml.in b/rules/base.xml.in
-index 13ba046..c770633 100644
---- a/rules/base.xml.in
-+++ b/rules/base.xml.in
-@@ -3597,12 +3597,6 @@
- <variantList>
- <variant>
- <configItem>
-- <name>std</name>
-- <_description>Standard</_description>
-- </configItem>
-- </variant>
-- <variant>
-- <configItem>
- <name>legacy</name>
- <_description>Legacy</_description>
- </configItem>
-diff --git a/symbols/tj b/symbols/tj
-index d9e5ff6..fcb884d 100644
---- a/symbols/tj
-+++ b/symbols/tj
-@@ -1,81 +1,5 @@
- // $XKeyboardConfig$
--// based on
--// Tajik keyboard
--// it is a Russian layout keyboard, with SHCHA replaced with
--// dead_cedilla/dead_macron
--// that allows to type the SHCHA with dead_cedilla + SHA
--// and all the extra Tajik keys:
--// dead_cedilla + KA, HA --> KA descender, HA descender
--// dead_macron + I, U, GHE --> I macron, U macron, GHE horizontal stroke
--// it requires proper dead_cedilla and dead_macron entries in Compose file
--// it also allows to use Mode_switch when in cyrillic mode to enter
--// special letters by doing Mode_switch + base letter
--//
--// AEN <aen at logic.ru> (for the Russian layout)
--// Pablo Saratxaga <pablo at mandrakesoft> (for the dead keys changes)
--//
--// 2008-06-22
--// Changed so that RightAlt allows to type the extra Tajik keys and that
--// SHCHA is back to normal again
--
--
--partial default alphanumeric_keys
--xkb_symbols "basic" {
--
-- name[Group1]= "Tajikistan";
--
- key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] };
- key <AB02> { [ Cyrillic_che, Cyrillic_CHE, 0x010004b7, 0x010004b6 ] };
- key <AB03> { [ Cyrillic_es, Cyrillic_ES ] };
@@ -265,27 +182,64 @@
- key <AE12> { [ equal, plus ] };
- key <LSGT> { [ bar, brokenbar ] };
- key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] };
--
-- // End alphanumeric section
--
--};
- // 17/07/2008
- // -------------------------------------------------------------
- // Standard Tojiki Keyboard Layout, Official Standard
-@@ -89,10 +13,10 @@ xkb_symbols "basic" {
- // --------------------------------------------------------------------
- //
++xkb_symbols "legacy"
++{
++ name[Group1] = "Tajikistan - Legacy";
--partial alphanumeric_keys
--xkb_symbols "std"
-+partial default alphanumeric_keys
-+xkb_symbols "basic"
- {
-- name[Group1] = "Tajikistan - Standard";
-+ name[Group1] = "Tajikistan";
+- // End alphanumeric section
++ include "keypad(comma)"
++ include "level3(ralt_switch)"
- include "keypad(comma)"
- include "level3(ralt_switch)"
++ key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; // Ñ Ð¯
++ key <AB02> { [ Cyrillic_che, Cyrillic_CHE, 0x10004b7, 0x10004b6 ] }; // ч Ч ҷ Ҷ
++ key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; // Ñ Ð¡
++ key <AB04> { [ Cyrillic_em, Cyrillic_EM ] }; // м М
++ key <AB05> { [ Cyrillic_i, Cyrillic_I, 0x10004e3, 0x10004e2 ] }; // и И ӣ Ӣ
++ key <AB06> { [ Cyrillic_te, Cyrillic_TE ] }; // т Т
++ key <AB07> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; // ь Ь
++ key <AB08> { [ Cyrillic_be, Cyrillic_BE ] }; // б Б
++ key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] }; // ю Ю
++ key <AB10> { [ period, comma ] }; // . ,
++ key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] }; // ф Ф
++ key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU ] }; // ы Ы
++ key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] }; // в В
++ key <AC04> { [ Cyrillic_a, Cyrillic_A ] }; // а Ð
++ key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] }; // п П
++ key <AC06> { [ Cyrillic_er, Cyrillic_ER ] }; // Ñ€ Ð
++ key <AC07> { [ Cyrillic_o, Cyrillic_O ] }; // о О
++ key <AC08> { [ Cyrillic_el, Cyrillic_EL ] }; // л Л
++ key <AC09> { [ Cyrillic_de, Cyrillic_DE ] }; // д Д
++ key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; // ж Ж
++ key <AC11> { [ Cyrillic_e, Cyrillic_E ] }; // Ñ Ð
++ key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; // й Й
++ key <AD02> { [ Cyrillic_tse, Cyrillic_TSE ] }; // ц Ц
++ key <AD03> { [ Cyrillic_u, Cyrillic_U, 0x10004ef, 0x10004ee ] }; // у У ӯ Ӯ
++ key <AD04> { [ Cyrillic_ka, Cyrillic_KA, 0x100049b, 0x100049a ] }; // к К қ Қ
++ key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] }; // е Е
++ key <AD06> { [ Cyrillic_en, Cyrillic_EN ] }; // н Ð
++ key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE, 0x1000493, 0x1000492 ] }; // г Г ғ Ғ
++ key <AD08> { [ Cyrillic_sha, Cyrillic_SHA ] }; // ш Ш
++ key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; // щ Щ
++ key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] }; // з З
++ key <AD11> { [ Cyrillic_ha, Cyrillic_HA, 0x10004b3, 0x10004b2 ] }; // х Х ҳ Ҳ
++ key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; // ъ Ъ
++ key <AE01> { [ 1, exclam, 0x10000a7 ] }; // 1 ! §
++ key <AE02> { [ 2, quotedbl, 0x10000ab, 0x10000bb ] }; // 2 " « »
++ key <AE03> { [ 3, numerosign ] }; // 3 â„–
++ key <AE04> { [ 4, semicolon ] }; // 4 ;
++ key <AE05> { [ 5, percent ] }; // 5 %
++ key <AE06> { [ 6, colon, 0x1002013 ] }; // 6 : –
++ key <AE07> { [ 7, question, ampersand ] }; // 7 ? &
++ key <AE08> { [ 8, asterisk ] }; // 8 *
++ key <AE09> { [ 9, parenleft ] }; // 9 (
++ key <AE10> { [ 0, parenright ] }; // 0 )
++ key <AE11> { [ minus, underscore ] }; // - _
++ key <AE12> { [ equal, plus ] }; // = +
++ key <BKSL> { [ backslash, slash ] }; // \ /
++ key <LSGT> { [ slash, bar ] }; // / |
++ key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; // Ñ‘ Ð
+ };
++
--
-1.5.4.3
+1.6.0.3
Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xkeyboard-config.spec 23 Nov 2008 04:17:49 -0000 1.28
+++ xkeyboard-config.spec 24 Nov 2008 03:56:27 -0000 1.29
@@ -4,7 +4,7 @@
Summary: X Keyboard Extension configuration data
Name: xkeyboard-config
Version: 1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -28,6 +28,7 @@
BuildRequires: perl(XML::Parser)
BuildRequires: intltool
BuildRequires: gettext
+BuildRequires: git-core
# NOTE: Any packages that need xkbdata to be installed should be using
# the following "Requires: xkbdata" virtual provide, and not directly depending
@@ -49,12 +50,17 @@
interface.
%prep
-%setup -q
-%patch1 -p1 -b .kzgroup
-%patch2 -p1 -b .usinet
-%patch3 -p1 -b .tj-variants
-%patch4 -p1 -b .battery
-%patch5 -p1 -b .jp-tilde
+%setup -q -n %{name}-%{version}
+
+git init-db
+if [ -z "$GIT_COMMITTER_NAME" ]; then
+ git config user.email "x at fedoraproject.org"
+ git config user.name "Fedora X Ninjas"
+fi
+git add .
+git commit -a -q -m "%{version} baseline."
+
+git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
%build
%configure \
@@ -94,6 +100,10 @@
%{_datadir}/X11/xkb/rules/xorg.xml
%changelog
+* Mon Nov 24 2008 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-7
+- Switch to using git patches, modelled after xorg-x11-server.
+- CVS remove unused patches.
+
* Sat Nov 22 2008 Matthias Clasen <mclasen at redhat.com> - 1.4-6
- Improve %%summary and %%description
- Better URL
--- olpc-xkeyboard-config-af.patch DELETED ---
--- olpc-xkeyboard-config-ng-group.patch DELETED ---
--- olpc-xkeyboard-config-ng-h.patch DELETED ---
--- xkeyboard-config-1.3-AC11-mapping-is.patch DELETED ---
- Previous message (by thread): rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.60, 1.61 kernel.spec, 1.1158, 1.1159
- Next message (by thread): rpms/vala/F-9 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 vala.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list