diff --git a/p_suse.diff b/p_suse.diff index 7d4271b..b6e746a 100644 --- a/p_suse.diff +++ b/p_suse.diff @@ -13,7 +13,7 @@ Index: symbols/pc key { [ Shift_R ] }; - key { [ Control_R ] }; + key { [ Control_R, Multi_key ] }; - key { [ Alt_R, Meta_R ] }; + - key { [ Super_R ] }; + key { [ Super_R, Multi_key ] }; diff --git a/xkeyboard-config-0.9.tar.bz2 b/xkeyboard-config-0.9.tar.bz2 deleted file mode 100644 index 22a7d4a..0000000 --- a/xkeyboard-config-0.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb84c40036c4eab0f88bf09951bf36c867d0196988636edfd6efa14d61be777d -size 471807 diff --git a/xkeyboard-config-1.0.tar.bz2 b/xkeyboard-config-1.0.tar.bz2 new file mode 100644 index 0000000..4861e9f --- /dev/null +++ b/xkeyboard-config-1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44e4765c90b4ff3791eee40bdd95ab24d5b0089e39badedc2155cf10d4072ffb +size 534180 diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index b0f03be..c2e5dca 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Thu Jul 12 04:27:49 CEST 2007 - sndirsch@suse.de + +- xkeyboard-config 1.0 + * It is about 9 months since 0.9 - and here goes 1.0. There is + nothing special big and special about that release, it is + rather "0.9 + 0.1" than "1.0" release. Around 70 bugs from + freedesktop.org bugzilla were fixed. The largest user-visible + change is elimination of the word "group" in base.xml - it is + replaced with "layout". This makes UIs using those strings + easier to perceive. +- removed obsolete patches + * xkeyboard-config.mainline-cvs.group.patch + * xkeyboard-config.mainline-cvs.il.patch + * xkeyboard-config.mainline-cvs.it.patch + * xkeyboard-config.mainline-cvs.level3.patch + * xkeyboard-config.mainline-cvs.mac-euro.patch + * xkeyboard-config.mainline-cvs.mac-us.patch + * xkeyboard-config.mainline-cvs.trans.patch + * xkeyboard-config.mainline-cvs.us-backslash.patch +- adjusted patches + * p_suse.diff + * xkeyboard-config.inet.patch + * xkeyboard-config.macintosh.patch + * xkeyboard-config.mainline-cvs.mac-es.patch + ------------------------------------------------------------------- Tue May 22 13:56:32 CEST 2007 - sndirsch@suse.de diff --git a/xkeyboard-config.inet.patch b/xkeyboard-config.inet.patch index 2df82ec..fbd9801 100644 --- a/xkeyboard-config.inet.patch +++ b/xkeyboard-config.inet.patch @@ -14,12 +14,3 @@ }; partial alphanumeric_keys -@@ -2229,7 +2229,7 @@ - key { [ XF86Mail ] }; - key { [ XF86Copy ] }; - key { [ XF86Paste ] }; -- key { [ XF86AudioEject ] }; -+ key { [ XF86Eject ] }; - key { [ XF86ScrollUp ] }; - key { [ XF86AudioMedia ] }; - }; diff --git a/xkeyboard-config.macintosh.patch b/xkeyboard-config.macintosh.patch index 542336b..fedc692 100644 --- a/xkeyboard-config.macintosh.patch +++ b/xkeyboard-config.macintosh.patch @@ -23,12 +23,8 @@ 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) +@@ -16,3 +16,3 @@ $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) diff --git a/xkeyboard-config.mainline-cvs.group.patch b/xkeyboard-config.mainline-cvs.group.patch deleted file mode 100644 index c551a0e..0000000 --- a/xkeyboard-config.mainline-cvs.group.patch +++ /dev/null @@ -1,47 +0,0 @@ - -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 - ---- - 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 { [ 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 { -+ type[Group1]="PC_BREAK", -+ symbols[Group1]= [ Shift_L, ISO_Next_Group ] -+ }; -+ key { [ 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) diff --git a/xkeyboard-config.mainline-cvs.il.patch b/xkeyboard-config.mainline-cvs.il.patch deleted file mode 100644 index 9ca5b7b..0000000 --- a/xkeyboard-config.mainline-cvs.il.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: symbols/il -=================================================================== -RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/il,v -retrieving revision 1.12 -retrieving revision 1.13 -diff -u -r1.12 -r1.13 ---- symbols/il 19 Nov 2006 13:15:56 -0000 1.12 -+++ symbols/il 13 May 2007 11:23:38 -0000 1.13 -@@ -76,7 +76,7 @@ - key { [ bracketright, braceright, 0x10005bf ]}; // Rafe - key { [ bracketleft, braceleft, 0x10005bd ]}; // Meteg - -- key { [ backslash, backslash, 0x10005bb ]}; // Qubuts -+ key { [ backslash, bar, 0x10005bb ]}; // Qubuts - }; - - diff --git a/xkeyboard-config.mainline-cvs.it.patch b/xkeyboard-config.mainline-cvs.it.patch deleted file mode 100644 index c2d5f84..0000000 --- a/xkeyboard-config.mainline-cvs.it.patch +++ /dev/null @@ -1,25 +0,0 @@ - - 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 { [ q, Q ] }; - key { [ z, Z ] }; -- key { [ e, E ] }; -+ key { [ e, E, EuroSign ] }; - key { [ r, R, registered ] }; - key { [ t, T ] }; - key { [ y, Y, Uacute, ydiaeresis ] }; diff --git a/xkeyboard-config.mainline-cvs.level3.patch b/xkeyboard-config.mainline-cvs.level3.patch deleted file mode 100644 index 9e22168..0000000 --- a/xkeyboard-config.mainline-cvs.level3.patch +++ /dev/null @@ -1,64 +0,0 @@ - - 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 { }; -+ 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 { }; -+ 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 { }; -+ 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 { }; -+ 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 { }; -+ 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 { }; -+ modifier_map Mod5 { ISO_Level3_Shift }; - }; diff --git a/xkeyboard-config.mainline-cvs.mac-es.patch b/xkeyboard-config.mainline-cvs.mac-es.patch index 40686d7..d23adea 100644 --- a/xkeyboard-config.mainline-cvs.mac-es.patch +++ b/xkeyboard-config.mainline-cvs.mac-es.patch @@ -1,43 +1,24 @@ 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 { [ bracketleft, bracketright, braceleft, braceright ] }; - key { [ less, greater, bracketleft, braceleft ] }; -- key { [ 1, exclam ] }; -- key { [ 2, exclamdown, at, oneeighth ] }; -+ key { [ 1, exclamdown, leftsinglequotemark, rightsinglequotemark ] }; -+ key { [ 2, exclam, leftdoublequotemark, rightdoublequotemark ] }; - key { [ 3, numbersign, guillemotleft, guillemotright ] }; - key { [ 4, dollar, yen, Icircumflex ] }; - key { [ 5, percent ] }; -@@ -22,8 +22,14 @@ xkb_symbols "basic" { - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus, plusminus ] }; -+ key { [ r, R, registered ] }; -+ key { [ y, Y, Yen ] }; -+ key { [ u, U, EuroSign ] }; - key { [ dead_grave, degree ] }; - key { [ dead_acute, dead_diaeresis, bar ] }; -+ key { [ g, G, at ] }; -+ key { [ z, Z, Greek_OMEGA, doublelowquotemark ] }; -+ key { [ c, C, copyright ] }; - - key { [ comma, questiondown ] }; - key { [ period, question ] }; -@@ -34,5 +40,7 @@ xkb_symbols "basic" { - - // End alphanumeric section - +--- symbols/macintosh_vndr/es.orig 2007-07-12 05:21:17.691899075 +0200 ++++ symbols/macintosh_vndr/es 2007-07-12 05:25:17.182286822 +0200 +@@ -3,4 +3,19 @@ + xkb_symbols "basic" { + include "es" + name[Group1]= "Spain - Mac"; ++ ++ key { [ 1, exclamdown, leftsinglequotemark, rightsinglequotemark ] }; ++ key { [ 2, exclam, leftdoublequotemark, rightdoublequotemark ] }; ++ ++ key { [ r, R, registered ] }; ++ key { [ y, Y, Yen ] }; ++ key { [ u, U, EuroSign ] }; ++ ++ key { [ g, G, at ] }; ++ ++ key { [ z, Z, Greek_OMEGA, doublelowquotemark ] }; ++ key { [ c, C, copyright ] }; ++ + // MacOS does not have euro on e, include it anyway + include "eurosign(e)" - include "level3(ralt_switch)" }; diff --git a/xkeyboard-config.mainline-cvs.mac-euro.patch b/xkeyboard-config.mainline-cvs.mac-euro.patch deleted file mode 100644 index 760df0b..0000000 --- a/xkeyboard-config.mainline-cvs.mac-euro.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 { [ 1, exclam, exclamdown, onesuperior ]}; - key { [ 2, quotedbl, at, twosuperior ]}; - key { [ 3, numbersign, sterling, threesuperior ]}; -- key { [ 4, currency, dollar, onequarter ]}; -+ key { [ 4, EuroSign, dollar, onequarter ]}; - key { [ 5, percent, NoSymbol, cent ]}; - key { [ 6, ampersand, yen, NoSymbol ]}; - key { [ 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 { [ equal ] }; diff --git a/xkeyboard-config.mainline-cvs.mac-us.patch b/xkeyboard-config.mainline-cvs.mac-us.patch deleted file mode 100644 index f8884da..0000000 --- a/xkeyboard-config.mainline-cvs.mac-us.patch +++ /dev/null @@ -1,60 +0,0 @@ - - symbols/macintosh_vndr/us: revision 1.4 - date: 2006-10-16 21:31:33 +0200; author: svu; state: Exp; lines: +6 -5 - Fix 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 { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; -- key { [ BackSpace ] }; - -- key { [ Tab, ISO_Left_Tab ] }; - key { [ q, Q ] }; - key { [ w, W ] }; - key { [ e, E ] }; -@@ -39,7 +37,6 @@ xkb_symbols "extended" { - key { [ bracketright, braceright ] }; - key { [ backslash, bar ] }; - -- key { [ Caps_Lock ] }; - key { [ a, A ] }; - key { [ s, S ] }; - key { [ d, D ] }; -@@ -51,7 +48,6 @@ xkb_symbols "extended" { - key { [ l, L ] }; - key { [ semicolon, colon ] }; - key { [ quoteright, quotedbl ] }; -- key { [ Return ] }; - - key { [ z, Z ] }; - key { [ x, X ] }; -@@ -67,7 +63,6 @@ xkb_symbols "extended" { - key { [ space ] }; - // End alphanumeric section - -- key { [ Num_Lock, Pointer_EnableKeys ] }; - - include "keypad" - -@@ -111,6 +106,12 @@ xkb_symbols "oldmac" { - key { [ Right ] }; - // End "Editing" section - -+ key { [ BackSpace ] }; -+ key { [ Tab, ISO_Left_Tab ] }; -+ key { [ Return ] }; -+ key { [ Caps_Lock ] }; -+ key { [ Num_Lock, Pointer_EnableKeys ] }; -+ - // Begin "Modifier" section - key { [ Shift_L ] }; - key { [ Shift_R ] }; diff --git a/xkeyboard-config.mainline-cvs.trans.patch b/xkeyboard-config.mainline-cvs.trans.patch deleted file mode 100644 index 748776a..0000000 --- a/xkeyboard-config.mainline-cvs.trans.patch +++ /dev/null @@ -1,629 +0,0 @@ ---- 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 <\\|> 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" diff --git a/xkeyboard-config.mainline-cvs.us-backslash.patch b/xkeyboard-config.mainline-cvs.us-backslash.patch deleted file mode 100644 index 2f4e1d3..0000000 --- a/xkeyboard-config.mainline-cvs.us-backslash.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: symbols/us -=================================================================== -RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/us,v -retrieving revision 1.27 -retrieving revision 1.28 -diff -u -r1.27 -r1.28 ---- symbols/us 6 Mar 2007 22:58:42 -0000 1.27 -+++ symbols/us 29 Apr 2007 16:28:26 -0000 1.28 -@@ -61,6 +61,7 @@ - key { [ period, greater ] }; - key { [ slash, question ] }; - -+ key { [ backslash, bar ] }; - // End alphanumeric section - }; - diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 601ff98..93f6497 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,5 +1,5 @@ # -# spec file for package xkeyboard-config (Version 0.9) +# spec file for package xkeyboard-config (Version 1.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,25 +13,17 @@ Name: xkeyboard-config BuildRequires: intltool perl-XML-Parser xorg-x11 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) +License: GPL v2 or later, LGPL v2 or later 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: 60 +Version: 1.0 +Release: 1 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 -Patch7: xkeyboard-config.mainline-cvs.il.patch -Patch8: xkeyboard-config.mainline-cvs.us-backslash.patch Patch9: tp-menu.diff Patch40: xkeyboard-config.macintosh.patch Patch100: p_suse.diff @@ -58,15 +50,7 @@ Authors: %prep %setup -q -%patch0 -%patch1 -%patch2 -%patch3 %patch4 -%patch5 -%patch6 -%patch7 -%patch8 %patch9 %patch40 %patch100 @@ -99,6 +83,29 @@ rm -rf $RPM_BUILD_ROOT /usr/share/X11/xkb/ %changelog +* Thu Jul 12 2007 - sndirsch@suse.de +- xkeyboard-config 1.0 + * It is about 9 months since 0.9 - and here goes 1.0. There is + nothing special big and special about that release, it is + rather "0.9 + 0.1" than "1.0" release. Around 70 bugs from + freedesktop.org bugzilla were fixed. The largest user-visible + change is elimination of the word "group" in base.xml - it is + replaced with "layout". This makes UIs using those strings + easier to perceive. +- removed obsolete patches + * xkeyboard-config.mainline-cvs.group.patch + * xkeyboard-config.mainline-cvs.il.patch + * xkeyboard-config.mainline-cvs.it.patch + * xkeyboard-config.mainline-cvs.level3.patch + * xkeyboard-config.mainline-cvs.mac-euro.patch + * xkeyboard-config.mainline-cvs.mac-us.patch + * xkeyboard-config.mainline-cvs.trans.patch + * xkeyboard-config.mainline-cvs.us-backslash.patch +- adjusted patches + * p_suse.diff + * xkeyboard-config.inet.patch + * xkeyboard-config.macintosh.patch + * xkeyboard-config.mainline-cvs.mac-es.patch * Tue May 22 2007 - sndirsch@suse.de - tp-menu.diff: * add mapping for Menu key on new Thinkpads like T60 (Bug #253397)