OBS User unknown 2007-01-15 23:42:43 +00:00 committed by Git OBS Bridge
commit fbae3c5251
18 changed files with 1705 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

11
cz-basic-bksl.diff Normal file
View File

@ -0,0 +1,11 @@
--- symbols/cz.orig 2006-10-27 14:14:22.000000000 +0200
+++ symbols/cz 2006-10-27 14:16:07.000000000 +0200
@@ -54,7 +54,7 @@
key <AC10> { [ uring, quotedbl, dollar, NoSymbol ] };
key <AC11> { [ section, exclam, apostrophe, ssharp ] };
key <AC12> { [ EuroSign, dead_diaeresis, NoSymbol, NoSymbol ] };
- key <BKSL> { [dead_diaeresis, apostrophe, backslash, bar ] };
+ key <BKSL> { [ backslash, bar, NoSymbol, NoSymbol ] };
key <LSGT> { [ backslash, bar, slash, NoSymbol ] };
key <AB01> { [ y, Y, degree, NoSymbol ] };

60
ibm_space_saver.diff Normal file
View File

@ -0,0 +1,60 @@
missing description
---
rules/base.lists.part | 2 ++
rules/base.m_s.part | 1 +
rules/base.xml.in | 6 ++++++
symbols/group | 5 +++++
4 files changed, 14 insertions(+)
Index: rules/base.lists.part
===================================================================
--- rules/base.lists.part.orig
+++ rules/base.lists.part
@@ -56,6 +56,8 @@
toshiba_s3000 trust trustda \
yahoo
+! $specialkbds = ibm_space_saver
+
// all layouts with 3rd and 4th groups
! $threelevellayouts = al az \
be br bt \
Index: rules/base.m_s.part
===================================================================
--- rules/base.m_s.part.orig
+++ rules/base.m_s.part
@@ -1,3 +1,4 @@
$inetkbds = +inet(%m)
+ $specialkbds = +group(%m)
$maclaptop = +inet(apple)+level3(enter_switch)
$macs = +inet(apple)
Index: rules/base.xml.in
===================================================================
--- rules/base.xml.in.orig
+++ rules/base.xml.in
@@ -706,6 +706,12 @@
</model>
<model>
<configItem>
+ <name>ibm_space_saver</name>
+ <_description>IBM Space Saver</_description>
+ </configItem>
+ </model>
+ <model>
+ <configItem>
<name>macintosh</name>
<_description>Macintosh</_description>
</configItem>
Index: symbols/group
===================================================================
--- symbols/group.orig
+++ symbols/group
@@ -318,3 +318,8 @@ xkb_symbols "alt_caps_toggle" {
};
};
+// Override broken Numlock key on some IBM keyboards
+partial
+xkb_symbols "ibm_space_saver" {
+ key <NMLK> { [ Num_Lock, Num_Lock ] };
+};

29
p_suse.diff Normal file
View File

@ -0,0 +1,29 @@
missing description
---
symbols/pc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: symbols/pc
===================================================================
--- symbols/pc.orig
+++ symbols/pc
@@ -37,9 +37,9 @@ xkb_symbols "pc105" {
key <LWIN> { [ Super_L ] };
key <RTSH> { [ Shift_R ] };
- key <RCTL> { [ Control_R ] };
+ key <RCTL> { [ Control_R, Multi_key ] };
key <RALT> { [ Alt_R, Meta_R ] };
- key <RWIN> { [ Super_R ] };
+ key <RWIN> { [ Super_R, Multi_key ] };
key <MENU> { [ Menu ] };
@@ -48,6 +48,7 @@ xkb_symbols "pc105" {
modifier_map Lock { Caps_Lock, ISO_Lock };
modifier_map Control{ Control_L, Control_R };
modifier_map Mod2 { Num_Lock };
+ modifier_map Mod4 { Super_L, Super_R };
// Fake keys for virtual<->real modifiers mapping
key <LVL3> { [ ISO_Level3_Shift ] };

0
ready Normal file
View File

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb84c40036c4eab0f88bf09951bf36c867d0196988636edfd6efa14d61be777d
size 471807

338
xkeyboard-config.changes Normal file
View File

@ -0,0 +1,338 @@
-------------------------------------------------------------------
Wed Nov 15 05:00:18 CET 2006 - sndirsch@suse.de
- xkeyboard-config.mainline-cvs.trans.patch:
* updated Hungarian translations (Bug #8996)
-------------------------------------------------------------------
Fri Oct 27 20:02:54 CEST 2006 - olh@suse.de
- disable apple:badmap/apple:goodmap for Powerbooks with built-in
USB ISO keyboard. The kernel delivers the correct keys now
-------------------------------------------------------------------
Fri Oct 27 14:19:42 CEST 2006 - sndirsch@suse.de
- cz-basic-bksl.diff:
* fixes backslash/bar on czech keyboard (Bug #215359)
-------------------------------------------------------------------
Tue Oct 17 16:52:24 CEST 2006 - olh@suse.de
- update mac/es, add euro to mac/us and mac/dk
-------------------------------------------------------------------
Tue Oct 17 11:34:14 CEST 2006 - olh@suse.de
- more fixes from cvs, restore previous macintosh behaviour
-------------------------------------------------------------------
Tue Oct 17 00:08:50 CEST 2006 - olh@suse.de
- fix symbols on macintosh
-------------------------------------------------------------------
Tue Oct 10 11:03:05 CEST 2006 - sndirsch@suse.de
- updated to release 0.9:
* Around 80 bugs from freedesktop.org bugzilla are fixed.
* New layouts/models/translations are introduced.
* Macintosh layouts are heavily redesigned (big thangs to Denis
Barbier).
- adjusted ibm_space_saver.diff, p_suse.diff
- obsoletes ISO_Level5.diff, c300.diff, logitech.diff, ralt.diff,
xkeyboard-config_korean.diff
- disabled p_macintosh-kb.diff since it no longer applies due to
radical changes for Macintosh layout (see above); hopefully it's
no longer required ...
-------------------------------------------------------------------
Tue Aug 1 20:55:23 CEST 2006 - sndirsch@suse.de
- added xorg-x11 to Requires/BuildRequires to fix build
- cleanup
-------------------------------------------------------------------
Fri Jul 28 14:43:39 CEST 2006 - sndirsch@suse.de
- use "-fno-strict-aliasing"
-------------------------------------------------------------------
Thu Jul 27 12:49:40 CEST 2006 - sndirsch@suse.de
- added support for inet keys on Acer C300 Laptop (dsieben)
(fd.o Bug #7651)
-------------------------------------------------------------------
Tue Jul 25 11:13:31 CEST 2006 - sndirsch@suse.de
- adjusted for X.Org 7
-------------------------------------------------------------------
Sat Jun 24 10:40:25 CEST 2006 - sndirsch@suse.de
- logitech.diff:
* removed double entry for XF86AudioRaiseVolume (Bug #181118)
-------------------------------------------------------------------
Wed Jun 14 06:19:39 CEST 2006 - sndirsch@suse.de
- use explicit hexadecimal values instead of XK_ISO_Level5 defines;
makes changes in X.Org unnecessary (Bug #158951, X.Org Bug #4411)
-------------------------------------------------------------------
Sat Jun 10 21:05:15 CEST 2006 - sndirsch@suse.de
- ISO_Level5.diff:
* obsoletes ca_multi.diff (Bug #158951, X.Org Bug #4411)
-------------------------------------------------------------------
Fri Jun 9 17:51:50 CEST 2006 - sndirsch@suse.de
- ca_multi.diff:
* added support for "Canada - Multilingual" keyboard (Bug #158951)
-------------------------------------------------------------------
Sat Apr 15 21:57:21 CEST 2006 - sndirsch@suse.de
- updated to release 0.8
* obsoletes khmer.diff, numlock-scrollLock.diff
-------------------------------------------------------------------
Sat Mar 25 20:14:48 CET 2006 - sndirsch@suse.de
- ralt.diff:
* addresses RAlt problems (Bug #158177, Ubuntu #35845)
-------------------------------------------------------------------
Mon Mar 20 15:03:14 CET 2006 - sndirsch@suse.de
- xkeyboard-config_korean.diff:
* korean keyboard layout (Bug #87443, freedesktop Bug #6323)
-------------------------------------------------------------------
Mon Feb 13 10:35:59 CET 2006 - sndirsch@suse.de
- added missing xorg rules symlinks (Bug #150245)
-------------------------------------------------------------------
Wed Jan 25 21:49:25 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Sun Jan 22 22:13:49 CET 2006 - sndirsch@suse.de
- numlock-scrollLock.diff:
* fix for Numlock/ScrollLock problem (X.Org Bug #5635)
-------------------------------------------------------------------
Mon Jan 16 14:31:38 CET 2006 - sndirsch@suse.de
- khmer.diff:
* adds khmer keyboard support (Bug #143348)
-------------------------------------------------------------------
Wed Jan 4 15:20:05 CET 2006 - sndirsch@suse.de
- added xorg.lst compatibility symlink (required by xorgcfg)
-------------------------------------------------------------------
Fri Dec 23 17:44:26 CET 2005 - sndirsch@suse.de
- updated to new version 0.7
-------------------------------------------------------------------
Mon Dec 5 06:27:11 CET 2005 - sndirsch@suse.de
- updated to current CVS release (2005-12-05)
-------------------------------------------------------------------
Thu Dec 1 07:15:45 CET 2005 - sndirsch@suse.de
- updated to current CVS release (2005-12-01)
* obsoletes br-abnt2.diff
* fixes Dell Inspiron 6000 layout for special keys (#135764)
* obsoletes patches for symbols/macintosh_vndr/fr (X.Org #2870)
-------------------------------------------------------------------
Tue Sep 20 18:33:47 CEST 2005 - sndirsch@suse.de
- br-abnt2.diff:
* fixed brazilian "abnt2" keyboard layout (#116425)
-------------------------------------------------------------------
Tue Sep 6 11:58:10 CEST 2005 - sndirsch@suse.de
- removed Prereq to xorg-x11 (#115369)
-------------------------------------------------------------------
Thu Aug 25 08:54:33 CEST 2005 - sndirsch@suse.de
- updated to new version 0.6
* move Macedonian to country-based
* translation updates
-------------------------------------------------------------------
Wed Aug 24 21:59:35 CEST 2005 - sndirsch@suse.de
- updated to current CVS release (2005-08-24)
* fr-latin9 compatibility rule added
* added Thaana Keyboard Map
* "Major Balkanian revolution" (Danilo Segan)
* updated russian and turkish translations
-------------------------------------------------------------------
Sat Aug 20 01:16:45 CEST 2005 - sndirsch@suse.de
- updated to current CVS release (2005-08-20)
* updated Iranian layout to new standard (fd.o Bug #4102)
* updated translations for tr
-------------------------------------------------------------------
Wed Aug 17 16:45:31 CEST 2005 - sndirsch@suse.de
- ibm_space_saver.diff:
* add support for "ibm_space_saver" keyboards (Bug #59788)
-------------------------------------------------------------------
Sun Aug 14 11:08:33 CEST 2005 - sndirsch@suse.de
- updated to current CVS release (2005-08-14)
* obsoletes print-screen.diff
* buildfix for update-pot/update-po in po/Makefile.am
-------------------------------------------------------------------
Thu Aug 11 06:09:05 CEST 2005 - sndirsch@suse.de
- print-screen.diff:
* fixes GNOME print-screen functionality (Bug #103990)
-------------------------------------------------------------------
Wed Aug 10 15:23:50 CEST 2005 - sndirsch@suse.de
- updated to current CVS release (2005-08-10)
-------------------------------------------------------------------
Tue Aug 2 23:50:25 CEST 2005 - schwab@suse.de
- Fix reference to eject key in macintosh keymap.
- Make noarch.
-------------------------------------------------------------------
Fri Jul 29 15:49:30 CEST 2005 - sndirsch@suse.de
- xkeyboard-config-0.5.diff:
* fixes typo: options --> option (Bug #98980)
- enabled use of xkeyboard-config again
-------------------------------------------------------------------
Thu Jul 28 23:36:18 CEST 2005 - sndirsch@suse.de
- make xkeyboard-config optional again; currently to big problems
(Bug #98980)
-------------------------------------------------------------------
Tue Jul 26 15:12:41 CEST 2005 - sndirsch@suse.de
- finally remove /etc/X11/xkb/symbols/pc directory of xorg-x11
package (%pre)
-------------------------------------------------------------------
Thu Jul 14 11:08:17 CEST 2005 - sndirsch@suse.de
- added /etc/X11/xkb/xkbcomp to package instead of
creating/removing the symlink in %post/%preun
-------------------------------------------------------------------
Mon Jul 11 12:36:29 CEST 2005 - sndirsch@suse.de
- add "Prereq: xorg-x11" to make sure that /etc/X11/xkb/symbols/pc/
directory will be removed before xkeyboard-config installs
/etc/X11/xkb/symbols/pc file (Bug #95914).
-------------------------------------------------------------------
Wed Jul 6 23:29:01 CEST 2005 - sndirsch@suse.de
- add symlink /usr/X11R6/lib/X11/xkb --> /etc/X11/xkb
-------------------------------------------------------------------
Wed Jul 6 15:19:06 CEST 2005 - sndirsch@suse.de
- install package during update when xorg-x11/XFree86 package was
already installed
-------------------------------------------------------------------
Wed Jul 6 14:59:37 CEST 2005 - sndirsch@suse.de
- use /etc/X11/xkb for data files now; replaces the data files of
xorg-x11 package
-------------------------------------------------------------------
Fri May 13 04:52:20 CEST 2005 - sndirsch@suse.de
- use norootforbuild
-------------------------------------------------------------------
Sun Apr 17 20:00:08 CEST 2005 - sndirsch@suse.de
- enabled compatibity rules (compatibility on 'XkbLayout' level)
-------------------------------------------------------------------
Sun Feb 6 02:12:30 CET 2005 - sndirsch@suse.de
- updated to release 0.5:
* More bugs from freedesktop.org bugzilla fixed.
The group names now are matching the descriptions - and the
validating scripts are implemented.
Some layouts, variants, models are added/fixed.
Some translations are updated (though the overall translation
activity is disappointinly low).
* obsoletes p_xkb-cherryblueb.diff
-------------------------------------------------------------------
Sun Oct 24 22:56:16 CEST 2004 - sndirsch@suse.de
- updated patches
- removed obsolete patches
-------------------------------------------------------------------
Sun Oct 3 19:24:51 CEST 2004 - sndirsch@suse.de
- updated to release 0.4:
* A lot of fixes. More univeral EURO handling. New urdu layout.
Improved handling for indicators.
-------------------------------------------------------------------
Wed Sep 29 18:36:30 CEST 2004 - sndirsch@suse.de
- added missing prerequires ln,rm (Bug #46480)
-------------------------------------------------------------------
Sat Jul 24 02:13:58 CEST 2004 - sndirsch@suse.de
- updated to release 0.3
* adjusted patches p_XFree86-4.3-kbdmapping.diff,
p_xkb-cherryblueb.diff
* adjusted filelist (.mo files no longer exist, added HOWTO.testing)
-------------------------------------------------------------------
Wed Jul 21 11:21:09 CEST 2004 - sndirsch@suse.de
- added README.SuSE
-------------------------------------------------------------------
Sun Jun 13 00:32:45 CEST 2004 - sndirsch@suse.de
- added required hunks of X.Org patches for xkb:
* p_suse.diff
* p_fixes.diff
* p_xkb-cherryblueb.diff
* p_XFree86-4.3-kbdmapping.diff
* p_macintosh-kb.diff
-------------------------------------------------------------------
Sat Jun 12 18:45:50 CEST 2004 - sndirsch@suse.de
- created package

View File

@ -0,0 +1,34 @@
https://bugs.freedesktop.org/show_bug.cgi?id=8660
handle the left contrl/option/apple keys properly.
apple+tab switches window
alt+e gives euro, alt+l gives @, etc
---
rules/base.ml1_s.part | 2 +-
rules/base.ml_s.part | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: rules/base.ml1_s.part
===================================================================
--- rules/base.ml1_s.part.orig
+++ rules/base.ml1_s.part
@@ -5,5 +5,5 @@
macintosh_old us = macintosh_vndr/us(oldmac)
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1])
- $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])
+ $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])+altwin(swap_lalt_lwin)+level3(alt_switch)
* * = pc+%l[1]%(v[1])
Index: rules/base.ml_s.part
===================================================================
--- rules/base.ml_s.part.orig
+++ rules/base.ml_s.part
@@ -14,7 +14,7 @@
macintosh_old $nonlatin = macintosh_vndr/us(oldmac)+%l%(v):2
macintosh_old * = macintosh_vndr/us(oldmac)+%l%(v)
$macs en_US = pc+macintosh_vndr/us(extended)
- $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)
+ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)+altwin(swap_lalt_lwin)+level3(alt_switch)
* jp = pc+jp(latin)+jp:2
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)

View File

@ -0,0 +1,47 @@
symbols/group revision 1.10
rules/base.o_s.part revision 1.18
date: 2006-10-16 21:27:05 +0200; author: svu; state: Exp; lines: +14 -1
added Alexey Morozov <morozov@gorodok.net>
---
rules/base.o_s.part | 1 +
symbols/group | 13 +++++++++++++
2 files changed, 14 insertions(+)
Index: symbols/group
===================================================================
--- symbols/group.orig
+++ symbols/group
@@ -113,6 +113,19 @@ xkb_symbols "ctrl_shift_toggle" {
key <RCTL> { [ Control_R, ISO_Next_Group ] };
};
+// using the group(lctrl_lshift_toggle) map, pressing:
+// Control_L+Shift_L locks the next group
+// If you have two groups and group wrap is enabled, the effect is
+// indistinguishable.
+partial modifier_keys
+xkb_symbols "lctrl_lshift_toggle" {
+ key <LFSH> {
+ type[Group1]="PC_BREAK",
+ symbols[Group1]= [ Shift_L, ISO_Next_Group ]
+ };
+ key <LCTL> { [ Control_L, ISO_Next_Group ] };
+};
+
// using the group(caps_toggle) map, pressing:
// Caps Lock toggles groups
// Shift+Caps Lock toggles caps lock
Index: rules/base.o_s.part
===================================================================
--- rules/base.o_s.part.orig
+++ rules/base.o_s.part
@@ -16,6 +16,7 @@
grp:ctrls_toggle = +group(ctrls_toggle)
grp:alts_toggle = +group(alts_toggle)
grp:ctrl_shift_toggle = +group(ctrl_shift_toggle)
+ grp:lctrl_lshift_toggle = +group(lctrl_lshift_toggle)
grp:caps_toggle = +group(caps_toggle)
grp:shift_caps_toggle = +group(shift_caps_toggle)
grp:alt_caps_toggle = +group(alt_caps_toggle)

View File

@ -0,0 +1,25 @@
symbols/it revision 1.10
date: 2006-10-15 23:17:04 +0200; author: svu; state: Exp; lines: +2 -2
forgotten comma
----------------------------
symbols/it revision 1.9
date: 2006-10-10 23:59:37 +0200; author: svu; state: Exp; lines: +2 -2
added Euro to it(mac)
---
symbols/it | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: symbols/it
===================================================================
--- symbols/it.orig
+++ symbols/it
@@ -89,7 +89,7 @@ xkb_symbols "mac" {
key <AD01> { [ q, Q ] };
key <AD02> { [ z, Z ] };
- key <AD03> { [ e, E ] };
+ key <AD03> { [ e, E, EuroSign ] };
key <AD04> { [ r, R, registered ] };
key <AD05> { [ t, T ] };
key <AD06> { [ y, Y, Uacute, ydiaeresis ] };

View File

@ -0,0 +1,64 @@
symbols/level3: revision 1.15
date: 2006-10-16 22:17:16 +0200; author: svu; state: Exp; lines: +7 -7
reverding wrong fix for mods, b.fd.o#8670
---
symbols/level3 | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
Index: symbols/level3
===================================================================
--- symbols/level3.orig
+++ symbols/level3
@@ -14,7 +14,7 @@ xkb_symbols "ralt_switch" {
type[Group1]="ONE_LEVEL",
symbols[Group1] = [ ISO_Level3_Shift ]
};
- modifier_map Mod5 { <RALT> };
+ modifier_map Mod5 { ISO_Level3_Shift };
};
partial modifier_keys
@@ -66,7 +66,7 @@ xkb_symbols "switch" {
type[Group1]="ONE_LEVEL",
symbols[Group1] = [ ISO_Level3_Shift ]
};
- modifier_map Mod5 { <RCTL> };
+ modifier_map Mod5 { ISO_Level3_Shift };
};
// using the level(menu_switch) map, the Menu key temporarily
@@ -77,7 +77,7 @@ xkb_symbols "menu_switch" {
type[Group1]="ONE_LEVEL",
symbols[Group1] = [ ISO_Level3_Shift ]
};
- modifier_map Mod5 { <MENU> };
+ modifier_map Mod5 { ISO_Level3_Shift };
};
// using the level3(win_switch) map, the either Windows' logo key
@@ -96,7 +96,7 @@ xkb_symbols "lwin_switch" {
type[Group1]="ONE_LEVEL",
symbols[Group1] = [ ISO_Level3_Shift ]
};
- modifier_map Mod5 { <LWIN> };
+ modifier_map Mod5 { ISO_Level3_Shift };
};
// using the level(rwin_switch) map, the right Windows' logo key
@@ -109,7 +109,7 @@ xkb_symbols "rwin_switch" {
type[Group1]="ONE_LEVEL",
symbols[Group1] = [ ISO_Level3_Shift ]
};
- modifier_map Mod5 { <RWIN> };
+ modifier_map Mod5 { ISO_Level3_Shift };
};
// using the level3(enter_switch) map, the Enter key on the keypad
@@ -121,5 +121,5 @@ xkb_symbols "enter_switch" {
type[Group1]="ONE_LEVEL",
symbols[Group1] = [ ISO_Level3_Shift ]
};
- modifier_map Mod5 { <KPEN> };
+ modifier_map Mod5 { ISO_Level3_Shift };
};

View File

@ -0,0 +1,43 @@
https://bugs.freedesktop.org/show_bug.cgi?id=8683
---
symbols/macintosh_vndr/es | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
Index: symbols/macintosh_vndr/es
===================================================================
--- symbols/macintosh_vndr/es.orig
+++ symbols/macintosh_vndr/es
@@ -10,8 +10,8 @@ xkb_symbols "basic" {
key <TLDE> { [ bracketleft, bracketright, braceleft, braceright ] };
key <LSGT> { [ less, greater, bracketleft, braceleft ] };
- key <AE01> { [ 1, exclam ] };
- key <AE02> { [ 2, exclamdown, at, oneeighth ] };
+ key <AE01> { [ 1, exclamdown, leftsinglequotemark, rightsinglequotemark ] };
+ key <AE02> { [ 2, exclam, leftdoublequotemark, rightdoublequotemark ] };
key <AE03> { [ 3, numbersign, guillemotleft, guillemotright ] };
key <AE04> { [ 4, dollar, yen, Icircumflex ] };
key <AE05> { [ 5, percent ] };
@@ -22,8 +22,14 @@ xkb_symbols "basic" {
key <AE10> { [ 0, parenright ] };
key <AE11> { [ minus, underscore ] };
key <AE12> { [ equal, plus, plusminus ] };
+ key <AD04> { [ r, R, registered ] };
+ key <AD06> { [ y, Y, Yen ] };
+ key <AD07> { [ u, U, EuroSign ] };
key <AD11> { [ dead_grave, degree ] };
key <AD12> { [ dead_acute, dead_diaeresis, bar ] };
+ key <AC05> { [ g, G, at ] };
+ key <AB01> { [ z, Z, Greek_OMEGA, doublelowquotemark ] };
+ key <AB03> { [ c, C, copyright ] };
key <AB08> { [ comma, questiondown ] };
key <AB09> { [ period, question ] };
@@ -34,5 +40,7 @@ xkb_symbols "basic" {
// End alphanumeric section
+ // MacOS does not have euro on e, include it anyway
+ include "eurosign(e)"
include "level3(ralt_switch)"
};

View File

@ -0,0 +1,39 @@
https://bugs.freedesktop.org/show_bug.cgi?id=8682
---
symbols/macintosh_vndr/dk | 3 ++-
symbols/macintosh_vndr/us | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
Index: symbols/macintosh_vndr/dk
===================================================================
--- symbols/macintosh_vndr/dk.orig
+++ symbols/macintosh_vndr/dk
@@ -16,7 +16,7 @@ xkb_symbols "basic" {
key <AE01> { [ 1, exclam, exclamdown, onesuperior ]};
key <AE02> { [ 2, quotedbl, at, twosuperior ]};
key <AE03> { [ 3, numbersign, sterling, threesuperior ]};
- key <AE04> { [ 4, currency, dollar, onequarter ]};
+ key <AE04> { [ 4, EuroSign, dollar, onequarter ]};
key <AE05> { [ 5, percent, NoSymbol, cent ]};
key <AE06> { [ 6, ampersand, yen, NoSymbol ]};
key <AE07> { [ 7, slash, braceleft, division ]};
@@ -44,6 +44,7 @@ xkb_symbols "basic" {
// End alphanumeric section
+ include "eurosign(e)"
include "level3(ralt_switch)"
};
Index: symbols/macintosh_vndr/us
===================================================================
--- symbols/macintosh_vndr/us.orig
+++ symbols/macintosh_vndr/us
@@ -64,6 +64,7 @@ xkb_symbols "extended" {
// End alphanumeric section
+ include "eurosign(e)"
include "keypad"
key <KPEQ> { [ equal ] };

View File

@ -0,0 +1,60 @@
symbols/macintosh_vndr/us: revision 1.4
date: 2006-10-16 21:31:33 +0200; author: svu; state: Exp; lines: +6 -5
Fix <BKSP> in symbols/macintosh_vndr/us, b.fd.o#8668
---
symbols/macintosh_vndr/us | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
Index: symbols/macintosh_vndr/us
===================================================================
--- symbols/macintosh_vndr/us.orig
+++ symbols/macintosh_vndr/us
@@ -22,9 +22,7 @@ xkb_symbols "extended" {
key <AE10> { [ 0, parenright ] };
key <AE11> { [ minus, underscore ] };
key <AE12> { [ equal, plus ] };
- key <BKSP> { [ BackSpace ] };
- key <TAB> { [ Tab, ISO_Left_Tab ] };
key <AD01> { [ q, Q ] };
key <AD02> { [ w, W ] };
key <AD03> { [ e, E ] };
@@ -39,7 +37,6 @@ xkb_symbols "extended" {
key <AD12> { [ bracketright, braceright ] };
key <BKSL> { [ backslash, bar ] };
- key <CAPS> { [ Caps_Lock ] };
key <AC01> { [ a, A ] };
key <AC02> { [ s, S ] };
key <AC03> { [ d, D ] };
@@ -51,7 +48,6 @@ xkb_symbols "extended" {
key <AC09> { [ l, L ] };
key <AC10> { [ semicolon, colon ] };
key <AC11> { [ quoteright, quotedbl ] };
- key <RTRN> { [ Return ] };
key <AB01> { [ z, Z ] };
key <AB02> { [ x, X ] };
@@ -67,7 +63,6 @@ xkb_symbols "extended" {
key <SPCE> { [ space ] };
// End alphanumeric section
- key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
include "keypad"
@@ -111,6 +106,12 @@ xkb_symbols "oldmac" {
key <RGHT> { [ Right ] };
// End "Editing" section
+ key <BKSP> { [ BackSpace ] };
+ key <TAB> { [ Tab, ISO_Left_Tab ] };
+ key <RTRN> { [ Return ] };
+ key <CAPS> { [ Caps_Lock ] };
+ key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+
// Begin "Modifier" section
key <LFSH> { [ Shift_L ] };
key <RTSH> { [ Shift_R ] };

View File

@ -0,0 +1,629 @@
--- po/hu.po 2 Oct 2006 18:45:47 -0000 1.9
+++ po/hu.po 13 Oct 2006 21:40:23 -0000 1.10
@@ -114,9 +112,8 @@
msgstr "A4Tech KBS-8"
#: ../rules/base.xml.in.h:24
-#, fuzzy
msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr "Dexxa Wireless Desktop billentyűzet"
+msgstr "A4Tech Wireless Desktop RFKB-23"
#: ../rules/base.xml.in.h:25
msgid "ACPI Standard"
@@ -128,11 +125,11 @@
#: ../rules/base.xml.in.h:27
msgid "Acer C300"
-msgstr ""
+msgstr "Acer C300"
#: ../rules/base.xml.in.h:28
msgid "Acer Ferrari 4000"
-msgstr ""
+msgstr "Acer Ferrari 4000"
#: ../rules/base.xml.in.h:29
msgid "Acer TravelMate 800"
@@ -160,7 +157,7 @@
#: ../rules/base.xml.in.h:35
msgid "Adding the nobreakspace keysym to space key"
-msgstr ""
+msgstr "Nem törhető szóköz szimbólum hozzáadása a szóköz billentyűhöz"
#: ../rules/base.xml.in.h:36
msgid "Advance Scorpius KI"
@@ -168,7 +165,7 @@
#: ../rules/base.xml.in.h:37
msgid "Afg"
-msgstr ""
+msgstr "Afg"
#: ../rules/base.xml.in.h:38
msgid "Afghanistan"
@@ -195,9 +192,8 @@
msgstr "Az Alt a jobb Win billentyűhöz van rendelve és a Super a menühöz."
#: ../rules/base.xml.in.h:44
-#, fuzzy
msgid "Alt+CapsLock changes group."
-msgstr "A Shift+CapsLock kombináció megváltoztatja a csoportot."
+msgstr "Az Alt+CapsLock megváltoztatja a csoportot."
#: ../rules/base.xml.in.h:45
msgid "Alt+Ctrl changes group."
@@ -220,9 +216,8 @@
msgstr "Alternatív"
#: ../rules/base.xml.in.h:50
-#, fuzzy
msgid "Alternative Eastern"
-msgstr "Alternatív"
+msgstr "Alternatív keleti"
#: ../rules/base.xml.in.h:51
msgid "Alternative international (former us_intl)"
@@ -237,13 +232,12 @@
msgstr "Alternatív, halott billentyűk tiltása"
#: ../rules/base.xml.in.h:54
-#, fuzzy
msgid "Alternative, latin-9 only"
-msgstr "Alternatív, halott billentyűk tiltása"
+msgstr "Alternatív, csak latin-9"
#: ../rules/base.xml.in.h:55
msgid "And"
-msgstr ""
+msgstr "And"
#: ../rules/base.xml.in.h:56
msgid "Andorra"
@@ -255,11 +249,11 @@
#: ../rules/base.xml.in.h:58
msgid "Apple"
-msgstr ""
+msgstr "Apple"
#: ../rules/base.xml.in.h:59
msgid "Apple Laptop"
-msgstr ""
+msgstr "Apple Laptop"
#: ../rules/base.xml.in.h:60
msgid "Ara"
@@ -314,9 +308,8 @@
msgstr "BTC 9001AH"
#: ../rules/base.xml.in.h:73
-#, fuzzy
msgid "BTC 9019U"
-msgstr "BTC 9001AH"
+msgstr "BTC 9019U"
#: ../rules/base.xml.in.h:74
msgid "Ban"
@@ -404,7 +397,7 @@
#: ../rules/base.xml.in.h:95
msgid "Buckwalter"
-msgstr ""
+msgstr "Buckwalter"
#: ../rules/base.xml.in.h:96
msgid "Bulgaria"
@@ -488,7 +477,7 @@
#: ../rules/base.xml.in.h:115
msgid "Cherry CyBo@rd USB-Hub"
-msgstr ""
+msgstr "Cherry CyBo@rd USB-Hub"
#: ../rules/base.xml.in.h:116
msgid "Cherry CyMotion Master Linux"
@@ -503,9 +492,8 @@
msgstr "Chicony KB-9885"
#: ../rules/base.xml.in.h:119
-#, fuzzy
msgid "Classic Dvorak"
-msgstr "Dvorak-féle"
+msgstr "Klasszikus Dvorak"
#: ../rules/base.xml.in.h:120
msgid "CloGaelach"
@@ -537,7 +525,7 @@
#: ../rules/base.xml.in.h:127
msgid "Congo, Democratic Republic of the"
-msgstr ""
+msgstr "Kongói Demokratikus Köztársaság"
#: ../rules/base.xml.in.h:128
msgid "Croatia"
@@ -573,7 +561,7 @@
#: ../rules/base.xml.in.h:136
msgid "DRC"
-msgstr ""
+msgstr "DRC"
#: ../rules/base.xml.in.h:137
msgid "DTK2000"
@@ -589,7 +577,7 @@
#: ../rules/base.xml.in.h:140
msgid "Default numpad keys."
-msgstr ""
+msgstr "Alapértelmezett numerikus billentyűk."
#: ../rules/base.xml.in.h:141
msgid "Dell"
@@ -601,7 +589,7 @@
#: ../rules/base.xml.in.h:143
msgid "Dell Latitude series laptop"
-msgstr ""
+msgstr "Dell Latitude sorozat laptop"
#: ../rules/base.xml.in.h:144
msgid "Dell USB Multimedia Keybard"
@@ -640,9 +628,8 @@
msgstr "Dvorak, lengyel idézőjelek az idézőjel billentyűn"
#: ../rules/base.xml.in.h:153
-#, fuzzy
msgid "Eastern"
-msgstr "eszperantó"
+msgstr "Keleti"
#: ../rules/base.xml.in.h:154
msgid "Eliminate dead keys"
@@ -654,7 +641,7 @@
#: ../rules/base.xml.in.h:156
msgid "Epo"
-msgstr ""
+msgstr "Epo"
#: ../rules/base.xml.in.h:157
msgid "Esp"
@@ -674,7 +661,7 @@
#: ../rules/base.xml.in.h:161
msgid "Evdev-managed keyboard"
-msgstr ""
+msgstr "Evdev által felügyelt billentyűzet"
#: ../rules/base.xml.in.h:162
msgid "Everex STEPnote"
@@ -725,9 +712,8 @@
msgstr "Francia"
#: ../rules/base.xml.in.h:174
-#, fuzzy
msgid "French (Macintosh)"
-msgstr "Macintosh"
+msgstr "Francia (Macintosh)"
#: ../rules/base.xml.in.h:175
msgid "French (legacy)"
@@ -747,7 +733,7 @@
#: ../rules/base.xml.in.h:179
msgid "Fula"
-msgstr ""
+msgstr "Fula"
#: ../rules/base.xml.in.h:180
msgid "GBr"
@@ -786,9 +772,8 @@
msgstr "Genius Comfy KB-21e-Scroll"
#: ../rules/base.xml.in.h:189
-#, fuzzy
msgid "Genius KB-19e NB"
-msgstr "Genius Comfy KB-12e"
+msgstr "Genius KB-19e NB"
#: ../rules/base.xml.in.h:190
msgid "Geo"
@@ -799,9 +784,8 @@
msgstr "Grúzia"
#: ../rules/base.xml.in.h:192
-#, fuzzy
msgid "German (Macintosh)"
-msgstr "Macintosh"
+msgstr "Német (Macintosh)"
#: ../rules/base.xml.in.h:193
msgid "German, Sun dead keys"
@@ -817,7 +801,7 @@
#: ../rules/base.xml.in.h:196
msgid "Gha"
-msgstr ""
+msgstr "Gha"
#: ../rules/base.xml.in.h:197
msgid "Ghana"
@@ -913,7 +897,7 @@
#: ../rules/base.xml.in.h:220
msgid "IBM (LST 1205-92)"
-msgstr ""
+msgstr "IBM (LST 1205-92)"
#: ../rules/base.xml.in.h:221
msgid "IBM Rapid Access"
@@ -932,9 +916,8 @@
msgstr "IBM ThinkPad 560Z/600/600E/A22E"
#: ../rules/base.xml.in.h:225
-#, fuzzy
msgid "IBM ThinkPad 560Z/600/600E/A22E, Intl"
-msgstr "IBM ThinkPad 560Z/600/600E/A22E"
+msgstr "IBM ThinkPad 560Z/600/600E/A22E, nemzetközi"
#: ../rules/base.xml.in.h:226
msgid "ISO Alternate"
@@ -946,7 +929,7 @@
#: ../rules/base.xml.in.h:228
msgid "Igbo"
-msgstr ""
+msgstr "Igbo"
#: ../rules/base.xml.in.h:229
msgid "Ind"
@@ -970,7 +953,7 @@
#: ../rules/base.xml.in.h:234
msgid "Iraq"
-msgstr ""
+msgstr "Irak"
#: ../rules/base.xml.in.h:235
msgid "Ireland"
@@ -986,7 +969,7 @@
#: ../rules/base.xml.in.h:238
msgid "Irq"
-msgstr ""
+msgstr "Irq"
#: ../rules/base.xml.in.h:239
msgid "Isl"
@@ -1014,7 +997,7 @@
#: ../rules/base.xml.in.h:245
msgid "Japan (PC-98xx Series)"
-msgstr ""
+msgstr "Japán (PC-98xx sorozat)"
#: ../rules/base.xml.in.h:246
msgid "Japanese 106-key"
@@ -1030,11 +1013,11 @@
#: ../rules/base.xml.in.h:249
msgid "Kashubian"
-msgstr ""
+msgstr "Kasub"
#: ../rules/base.xml.in.h:250
msgid "Kaz"
-msgstr ""
+msgstr "Kaz"
#: ../rules/base.xml.in.h:251
msgid "Kazakh with Russian"
@@ -1054,40 +1037,39 @@
#: ../rules/base.xml.in.h:255
msgid "Khm"
-msgstr ""
+msgstr "Khm"
#: ../rules/base.xml.in.h:256
msgid "Kor"
-msgstr ""
+msgstr "Kor"
#: ../rules/base.xml.in.h:257
msgid "Korea, Republic of"
-msgstr ""
+msgstr "Koreai köztársaság"
#: ../rules/base.xml.in.h:258
-#, fuzzy
msgid "Korean 106-key"
-msgstr "Japán 106 gombos"
+msgstr "Koreai 106 gombos"
#: ../rules/base.xml.in.h:259
msgid "Kotoistus"
-msgstr ""
+msgstr "Kotoistus"
#: ../rules/base.xml.in.h:260
msgid "Kurdish, (F)"
-msgstr ""
+msgstr "Kurd, (F)"
#: ../rules/base.xml.in.h:261
msgid "Kurdish, Arabic-Latin"
-msgstr ""
+msgstr "Kurd, arab-latin"
#: ../rules/base.xml.in.h:262
msgid "Kurdish, Latin Alt-Q"
-msgstr ""
+msgstr "Kurd, latin Alt-Q"
#: ../rules/base.xml.in.h:263
msgid "Kurdish, Latin Q"
-msgstr ""
+msgstr "Kurd, latin Q"
#: ../rules/base.xml.in.h:264
msgid "Kyr"
@@ -1146,18 +1128,16 @@
msgstr "Latin qwerty"
#: ../rules/base.xml.in.h:278
-#, fuzzy
msgid "Latin with guillemets"
-msgstr "Latin »hegyes« idézőjelekkel"
+msgstr "Latin, »csúcsos« idézőjelekkel"
#: ../rules/base.xml.in.h:279
msgid "Latvia"
msgstr "Lettország"
#: ../rules/base.xml.in.h:280
-#, fuzzy
msgid "Left Alt is swapped with left Win-key."
-msgstr "A Meta a bal Win billentyűhöz van rendelve."
+msgstr "A bal Alt fel van cserélve a bal Win billentyűvel."
#: ../rules/base.xml.in.h:281
msgid "Left Alt key changes group."
@@ -1180,9 +1160,8 @@
msgstr "A bal Win billentyű megváltoztatja a csoportot."
#: ../rules/base.xml.in.h:286
-#, fuzzy
msgid "Left Win-key is Compose."
-msgstr "A jobb Win billentyű a kombináló (Compose)."
+msgstr "A bal Win billentyű a kombináló (Compose)."
#: ../rules/base.xml.in.h:287
msgid "Left Win-key switches group while pressed."
@@ -1205,9 +1184,8 @@
msgstr "Logitech Cordless Desktop"
#: ../rules/base.xml.in.h:292
-#, fuzzy
msgid "Logitech Cordless Desktop LX-300"
-msgstr "Logitech Cordless Desktop"
+msgstr "Logitech Cordless Desktop LX-300"
#: ../rules/base.xml.in.h:293
msgid "Logitech Cordless Desktop Navigator"
@@ -1250,9 +1228,8 @@
msgstr "Logitech Ultra-X billentyűzet"
#: ../rules/base.xml.in.h:303
-#, fuzzy
msgid "Logitech diNovo Keyboard"
-msgstr "Logitech Access billentyűzet"
+msgstr "Logitech diNovo billentyűzet"
#: ../rules/base.xml.in.h:304
msgid "Logitech iTouch"
@@ -1291,14 +1268,12 @@
msgstr "Macintosh Old"
#: ../rules/base.xml.in.h:313
-#, fuzzy
msgid "Macintosh, Sun dead keys"
-msgstr "Német, Sun halott billentyűk"
+msgstr "Macintosh, Sun halott billentyűk"
#: ../rules/base.xml.in.h:314
-#, fuzzy
msgid "Macintosh, eliminate dead keys"
-msgstr "Német, halott billentyűk tiltása"
+msgstr "Macintosh, halott billentyűk tiltása"
#: ../rules/base.xml.in.h:315
msgid "Make CapsLock an additional Ctrl."
@@ -1322,7 +1297,7 @@
#: ../rules/base.xml.in.h:320
msgid "Maltese keyboard with US layout"
-msgstr ""
+msgstr "Máltai billentyűzet egyesült államokbeli kiosztással"
#: ../rules/base.xml.in.h:321
msgid "Mao"
@@ -1434,15 +1409,15 @@
#: ../rules/base.xml.in.h:348
msgid "Neostyle"
-msgstr ""
+msgstr "Neostyle"
#: ../rules/base.xml.in.h:349
msgid "Nep"
-msgstr ""
+msgstr "Nep"
#: ../rules/base.xml.in.h:350
msgid "Nepal"
-msgstr ""
+msgstr "Nepál"
#: ../rules/base.xml.in.h:351
msgid "Netherlands"
@@ -1450,7 +1425,7 @@
#: ../rules/base.xml.in.h:352
msgid "Nigeria"
-msgstr ""
+msgstr "Nigéria"
#: ../rules/base.xml.in.h:353
msgid "Nld"
@@ -1481,9 +1456,8 @@
msgstr "A NumLock LED-je mutassa a másik csoportot."
#: ../rules/base.xml.in.h:360
-#, fuzzy
msgid "Numpad keys work as with Mac."
-msgstr "A Shift+numerikus billentyűk úgy működjenek, mint az MS Windowsban."
+msgstr "A numerikus billentyűk úgy működjenek, mint Macen."
#: ../rules/base.xml.in.h:361
msgid "Ogham"
@@ -1502,13 +1476,12 @@
msgstr "Orija"
#: ../rules/base.xml.in.h:365
-#, fuzzy
msgid "Ossetian"
-msgstr "Orosz"
+msgstr "Oszét"
#: ../rules/base.xml.in.h:366
msgid "Ossetian, Winkeys"
-msgstr ""
+msgstr "Oszét, win gombok"
#: ../rules/base.xml.in.h:367
msgid "PC-98xx Series"
@@ -1524,7 +1497,7 @@
#: ../rules/base.xml.in.h:370
msgid "Pashto"
-msgstr ""
+msgstr "Pastu"
#: ../rules/base.xml.in.h:371
msgid "Pattachote"
@@ -1705,7 +1677,7 @@
#: ../rules/base.xml.in.h:415
msgid "SCG"
-msgstr ""
+msgstr "SCG"
#: ../rules/base.xml.in.h:416
msgid "SILVERCREST Multimedia Wireless Keyboard"
@@ -1773,19 +1745,19 @@
#: ../rules/base.xml.in.h:432
msgid "Space key output nobreakspace at fourth level."
-msgstr ""
+msgstr "A szóköz nem törhető szóközt ad a negyedik szinten."
#: ../rules/base.xml.in.h:433
msgid "Space key output nobreakspace at second level."
-msgstr ""
+msgstr "A szóköz nem törhető szóközt ad a második szinten."
#: ../rules/base.xml.in.h:434
msgid "Space key output nobreakspace at third level."
-msgstr ""
+msgstr "A szóköz nem törhető szóközt ad a harmadik szinten."
#: ../rules/base.xml.in.h:435
msgid "Space key output space at any level."
-msgstr ""
+msgstr "A szóköz nem törhető szóközt ad bármely szinten."
#: ../rules/base.xml.in.h:436
msgid "Spain"
@@ -1843,7 +1815,7 @@
#: ../rules/base.xml.in.h:451
msgid "Swap keycodes of two keys when Mac keyboards are misdetected by kernel."
-msgstr ""
+msgstr "Két billentyű kódjának felcserélése, ha a kernel rosszul észleli a Mac billentyűzetet."
#: ../rules/base.xml.in.h:452
msgid "Swe"
@@ -2022,9 +1994,8 @@
msgstr "Szlovén billentyűkombinációk használata"
#: ../rules/base.xml.in.h:496
-#, fuzzy
msgid "Use guillemets for quotes"
-msgstr "»Csúcsos« idézőjelek használata"
+msgstr "»Csúcsos« idézőjelek használata idézetekhez"
#: ../rules/base.xml.in.h:497
msgid "Use keyboard LED to show alternative group."
@@ -2048,11 +2019,11 @@
#: ../rules/base.xml.in.h:502
msgid "Wang model 724 azerty"
-msgstr ""
+msgstr "Wang 724-es modell, azerty"
#: ../rules/base.xml.in.h:503
msgid "Western"
-msgstr ""
+msgstr "Nyugati"
#: ../rules/base.xml.in.h:504
msgid "Winbook Model XP5"
@@ -2067,7 +2038,6 @@
msgstr "Az &lt;\\|&gt; billentyűvel"
#: ../rules/base.xml.in.h:507
-#, fuzzy
msgid "With guillemets"
msgstr "»Csúcsos« idézőjelekkel"
@@ -2077,7 +2047,7 @@
#: ../rules/base.xml.in.h:509
msgid "Yoruba"
-msgstr ""
+msgstr "Joruba"
#: ../rules/base.xml.in.h:510
msgid "Z and ZHE swapped"
@@ -2085,7 +2055,7 @@
#: ../rules/base.xml.in.h:511
msgid "Zar"
-msgstr ""
+msgstr "Zar"
#: ../rules/base.xml.in.h:512
msgid "azerty"
@@ -2118,18 +2088,3 @@
#: ../rules/base.xml.in.h:519
msgid "qwertz"
msgstr "qwertz"
-
-#~ msgid "Logitech Deluxe Access Keyboard"
-#~ msgstr "Logitech Deluxe Access billentyűzet"
-
-#~ msgid "Logitech iTouch keyboard Internet Navigator"
-#~ msgstr "Logitech iTouch Keyboard Internet Navigator"
-
-#~ msgid "Power G5"
-#~ msgstr "Power G5"
-
-#~ msgid "US keyboard with Maltian letters"
-#~ msgstr "US billentyűzet máltai betűkkel"
-
-#~ msgid "si1452"
-#~ msgstr "si1452"

View File

@ -0,0 +1,28 @@
The kernel has to deliver correct keys for ^° / <> on Powerbooks
with built-in USB ISO keyboard
This was finally corrected in the kernel.
---
keycodes/macintosh | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
Index: keycodes/macintosh
===================================================================
--- keycodes/macintosh.orig
+++ keycodes/macintosh
@@ -38,14 +38,11 @@ default xkb_keycodes "macintosh" {
};
+// not required, this was a kernel bug
xkb_keycodes "badmap" {
- <TLDE> = 94;
- <LSGT> = 49;
};
xkb_keycodes "goodmap" {
- <TLDE> = 49;
- <LSGT> = 94;
};
xkb_keycodes "old" {

271
xkeyboard-config.spec Normal file
View File

@ -0,0 +1,271 @@
#
# spec file for package xkeyboard-config (Version 0.9)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: xkeyboard-config
BuildRequires: intltool perl-XML-Parser xorg-x11 xorg-x11-devel
URL: http://www.freedesktop.org/Software/XKeyboardConfig
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/X11/Utilities
Requires: xorg-x11
Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
PreReq: /bin/ln /bin/rm
Autoreqprov: on
Version: 0.9
Release: 20
Summary: The X Keyboard Extension
Source: %name-%version.tar.bz2
Patch0: xkeyboard-config.mainline-cvs.group.patch
Patch1: xkeyboard-config.mainline-cvs.it.patch
Patch2: xkeyboard-config.mainline-cvs.level3.patch
Patch3: xkeyboard-config.mainline-cvs.mac-us.patch
Patch4: xkeyboard-config.mainline-cvs.mac-es.patch
Patch5: xkeyboard-config.mainline-cvs.mac-euro.patch
Patch6: xkeyboard-config.mainline-cvs.trans.patch
Patch40: xkeyboard-config.macintosh.patch
Patch100: p_suse.diff
Patch101: ibm_space_saver.diff
Patch102: cz-basic-bksl.diff
Patch103: xkeyboard-config.powerbook-usb-iso-keyboard.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
The X Keyboard Extension essentially replaces the core protocol
definition of keyboard. The extension makes possible to clearly and
explicitly specify most aspects of keyboard behaviour on per-key basis
and to more closely track the logical and physical state of the
keyboard. It also includes a number of keyboard controls designed to
make keyboards more accessible to people with physical impairments.
Authors:
--------
Ivan Pascal <pascal@info.tsu.ru>
Sergey V. Udaltsov <svu@users.sourceforge.net>
%prep
%setup -q
%patch0
%patch1
%patch2
%patch3
%patch4
%patch5
%patch6
%patch40
%patch100
%patch101
%patch102
%patch103
%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
intltoolize --force
autoreconf -fi
./configure --with-xkb-rules-symlink=xfree86,xorg \
--with-xkb-base=/usr/share/X11/xkb \
--enable-compat_rules \
--disable-xkbcomp-symlink
make
%install
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/var/lib/xkb
ln -snf /usr/bin/xkbcomp $RPM_BUILD_ROOT/usr/share/X11/xkb/xkbcomp
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc AUTHORS COPYING README docs/HOWTO.* docs/README.*
%dir /var/lib/xkb
/usr/share/X11/xkb/
%changelog -n xkeyboard-config
* Wed Nov 15 2006 - sndirsch@suse.de
- xkeyboard-config.mainline-cvs.trans.patch:
* updated Hungarian translations (Bug #8996)
* Fri Oct 27 2006 - olh@suse.de
- disable apple:badmap/apple:goodmap for Powerbooks with built-in
USB ISO keyboard. The kernel delivers the correct keys now
* Fri Oct 27 2006 - sndirsch@suse.de
- cz-basic-bksl.diff:
* fixes backslash/bar on czech keyboard (Bug #215359)
* Tue Oct 17 2006 - olh@suse.de
- update mac/es, add euro to mac/us and mac/dk
* Tue Oct 17 2006 - olh@suse.de
- more fixes from cvs, restore previous macintosh behaviour
* Tue Oct 17 2006 - olh@suse.de
- fix symbols on macintosh
* Tue Oct 10 2006 - sndirsch@suse.de
- updated to release 0.9:
* Around 80 bugs from freedesktop.org bugzilla are fixed.
* New layouts/models/translations are introduced.
* Macintosh layouts are heavily redesigned (big thangs to Denis
Barbier).
- adjusted ibm_space_saver.diff, p_suse.diff
- obsoletes ISO_Level5.diff, c300.diff, logitech.diff, ralt.diff,
xkeyboard-config_korean.diff
- disabled p_macintosh-kb.diff since it no longer applies due to
radical changes for Macintosh layout (see above); hopefully it's
no longer required ...
* Tue Aug 01 2006 - sndirsch@suse.de
- added xorg-x11 to Requires/BuildRequires to fix build
- cleanup
* Fri Jul 28 2006 - sndirsch@suse.de
- use "-fno-strict-aliasing"
* Thu Jul 27 2006 - sndirsch@suse.de
- added support for inet keys on Acer C300 Laptop (dsieben)
(fd.o Bug #7651)
* Tue Jul 25 2006 - sndirsch@suse.de
- adjusted for X.Org 7
* Sat Jun 24 2006 - sndirsch@suse.de
- logitech.diff:
* removed double entry for XF86AudioRaiseVolume (Bug #181118)
* Wed Jun 14 2006 - sndirsch@suse.de
- use explicit hexadecimal values instead of XK_ISO_Level5 defines;
makes changes in X.Org unnecessary (Bug #158951, X.Org Bug #4411)
* Sat Jun 10 2006 - sndirsch@suse.de
- ISO_Level5.diff:
* obsoletes ca_multi.diff (Bug #158951, X.Org Bug #4411)
* Fri Jun 09 2006 - sndirsch@suse.de
- ca_multi.diff:
* added support for "Canada - Multilingual" keyboard (Bug #158951)
* Sat Apr 15 2006 - sndirsch@suse.de
- updated to release 0.8
* obsoletes khmer.diff, numlock-scrollLock.diff
* Sat Mar 25 2006 - sndirsch@suse.de
- ralt.diff:
* addresses RAlt problems (Bug #158177, Ubuntu #35845)
* Mon Mar 20 2006 - sndirsch@suse.de
- xkeyboard-config_korean.diff:
* korean keyboard layout (Bug #87443, freedesktop Bug #6323)
* Mon Feb 13 2006 - sndirsch@suse.de
- added missing xorg rules symlinks (Bug #150245)
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Sun Jan 22 2006 - sndirsch@suse.de
- numlock-scrollLock.diff:
* fix for Numlock/ScrollLock problem (X.Org Bug #5635)
* Mon Jan 16 2006 - sndirsch@suse.de
- khmer.diff:
* adds khmer keyboard support (Bug #143348)
* Wed Jan 04 2006 - sndirsch@suse.de
- added xorg.lst compatibility symlink (required by xorgcfg)
* Fri Dec 23 2005 - sndirsch@suse.de
- updated to new version 0.7
* Mon Dec 05 2005 - sndirsch@suse.de
- updated to current CVS release (2005-12-05)
* Thu Dec 01 2005 - sndirsch@suse.de
- updated to current CVS release (2005-12-01)
* obsoletes br-abnt2.diff
* fixes Dell Inspiron 6000 layout for special keys (#135764)
* obsoletes patches for symbols/macintosh_vndr/fr (X.Org #2870)
* Tue Sep 20 2005 - sndirsch@suse.de
- br-abnt2.diff:
* fixed brazilian "abnt2" keyboard layout (#116425)
* Tue Sep 06 2005 - sndirsch@suse.de
- removed Prereq to xorg-x11 (#115369)
* Thu Aug 25 2005 - sndirsch@suse.de
- updated to new version 0.6
* move Macedonian to country-based
* translation updates
* Wed Aug 24 2005 - sndirsch@suse.de
- updated to current CVS release (2005-08-24)
* fr-latin9 compatibility rule added
* added Thaana Keyboard Map
* "Major Balkanian revolution" (Danilo Segan)
* updated russian and turkish translations
* Sat Aug 20 2005 - sndirsch@suse.de
- updated to current CVS release (2005-08-20)
* updated Iranian layout to new standard (fd.o Bug #4102)
* updated translations for tr
* Wed Aug 17 2005 - sndirsch@suse.de
- ibm_space_saver.diff:
* add support for "ibm_space_saver" keyboards (Bug #59788)
* Sun Aug 14 2005 - sndirsch@suse.de
- updated to current CVS release (2005-08-14)
* obsoletes print-screen.diff
* buildfix for update-pot/update-po in po/Makefile.am
* Thu Aug 11 2005 - sndirsch@suse.de
- print-screen.diff:
* fixes GNOME print-screen functionality (Bug #103990)
* Wed Aug 10 2005 - sndirsch@suse.de
- updated to current CVS release (2005-08-10)
* Tue Aug 02 2005 - schwab@suse.de
- Fix reference to eject key in macintosh keymap.
- Make noarch.
* Fri Jul 29 2005 - sndirsch@suse.de
- xkeyboard-config-0.5.diff:
* fixes typo: options --> option (Bug #98980)
- enabled use of xkeyboard-config again
* Thu Jul 28 2005 - sndirsch@suse.de
- make xkeyboard-config optional again; currently to big problems
(Bug #98980)
* Tue Jul 26 2005 - sndirsch@suse.de
- finally remove /etc/X11/xkb/symbols/pc directory of xorg-x11
package (%%pre)
* Thu Jul 14 2005 - sndirsch@suse.de
- added /etc/X11/xkb/xkbcomp to package instead of
creating/removing the symlink in %%post/%%preun
* Mon Jul 11 2005 - sndirsch@suse.de
- add "Prereq: xorg-x11" to make sure that /etc/X11/xkb/symbols/pc/
directory will be removed before xkeyboard-config installs
/etc/X11/xkb/symbols/pc file (Bug #95914).
* Wed Jul 06 2005 - sndirsch@suse.de
- add symlink /usr/X11R6/lib/X11/xkb --> /etc/X11/xkb
* Wed Jul 06 2005 - sndirsch@suse.de
- install package during update when xorg-x11/XFree86 package was
already installed
* Wed Jul 06 2005 - sndirsch@suse.de
- use /etc/X11/xkb for data files now; replaces the data files of
xorg-x11 package
* Fri May 13 2005 - sndirsch@suse.de
- use norootforbuild
* Sun Apr 17 2005 - sndirsch@suse.de
- enabled compatibity rules (compatibility on 'XkbLayout' level)
* Sun Feb 06 2005 - sndirsch@suse.de
- updated to release 0.5:
* More bugs from freedesktop.org bugzilla fixed.
The group names now are matching the descriptions - and the
validating scripts are implemented.
Some layouts, variants, models are added/fixed.
Some translations are updated (though the overall translation
activity is disappointinly low).
* obsoletes p_xkb-cherryblueb.diff
* Sun Oct 24 2004 - sndirsch@suse.de
- updated patches
- removed obsolete patches
* Sun Oct 03 2004 - sndirsch@suse.de
- updated to release 0.4:
* A lot of fixes. More univeral EURO handling. New urdu layout.
Improved handling for indicators.
* Wed Sep 29 2004 - sndirsch@suse.de
- added missing prerequires ln,rm (Bug #46480)
* Sat Jul 24 2004 - sndirsch@suse.de
- updated to release 0.3
* adjusted patches p_XFree86-4.3-kbdmapping.diff,
p_xkb-cherryblueb.diff
* adjusted filelist (.mo files no longer exist, added HOWTO.testing)
* Wed Jul 21 2004 - sndirsch@suse.de
- added README.SuSE
* Sun Jun 13 2004 - sndirsch@suse.de
- added required hunks of X.Org patches for xkb:
* p_suse.diff
* p_fixes.diff
* p_xkb-cherryblueb.diff
* p_XFree86-4.3-kbdmapping.diff
* p_macintosh-kb.diff
* Sat Jun 12 2004 - sndirsch@suse.de
- created package