svn merge ^/branches/released .

1 files changed, 225 insertions, 231 deletions

diff --git a/xorg-server/xkeyboard-config/keycodes/amiga b/xorg-server/xkeyboard-config/keycodes/amiga
index 7d2576701..f374ea658 100644
--- a/xorg-server/xkeyboard-config/keycodes/amiga
+++ b/xorg-server/xkeyboard-config/keycodes/amiga
@@ -1,231 +1,225 @@
-// $Xorg: amiga,v 1.3 2000/08/17 19:54:37 cpqbld Exp $
-
-
-
-// $XFree86: xc/programs/xkbcomp/keycodes/amiga,v 3.2 1997/10/26 13:25:35 dawes Exp $
-
-default xkb_keycodes "usa1" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  = 77;
-    <FK01> = 88;
-    <FK02> = 89;
-    <FK03> = 90;
-    <FK04> = 91;
-    <FK05> = 92;
-    <FK06> = 93;
-    <FK07> = 94;
-    <FK08> = 95;
-    <FK09> = 96;
-    <FK10> = 97;
-
-    <TLDE> = 8;
-    <AE01> = 9;
-    <AE02> = 10;
-    <AE03> = 11;
-    <AE04> = 12;
-    <AE05> = 13;
-    <AE06> = 14;
-    <AE07> = 15;
-    <AE08> = 16;
-    <AE09> = 17;
-    <AE10> = 18;
-    <AE11> = 19;
-    <AE12> = 20;
-    <BKSL> = 21;
-    <BKSP> = 73;
-
-    <TAB>  = 74;
-    <AD01> = 24;
-    <AD02> = 25;
-    <AD03> = 26;
-    <AD04> = 27;
-    <AD05> = 28;
-    <AD06> = 29;
-    <AD07> = 30;
-    <AD08> = 31;
-    <AD09> = 32;
-    <AD10> = 33;
-    <AD11> = 34;
-    <AD12> = 35;
-    <RTRN> = 76;
-
-    <LCTL> = 107;
-    <CAPS> = 106;
-    <AC01> = 40;
-    <AC02> = 41;
-    <AC03> = 42;
-    <AC04> = 43;
-    <AC05> = 44;
-    <AC06> = 45;
-    <AC07> = 46;
-    <AC08> = 47;
-    <AC09> = 48;
-    <AC10> = 49;
-    <AC11> = 50;
-
-    <LFSH> = 104;
-    <AB01> = 57;
-    <AB02> = 58;
-    <AB03> = 59;
-    <AB04> = 60;
-    <AB05> = 61;
-    <AB06> = 62;
-    <AB07> = 63;
-    <AB08> = 64;
-    <AB09> = 65;
-    <AB10> = 66;
-    <RTSH> = 105;
-
-    <LALT> = 108;
-    <LAMI> = 110;
-    <SPCE> = 72;
-    <RAMI> = 111;
-    <RALT> = 109;
-
-    <DELE> = 78;
-    <HELP> = 103;
-    <UP>   = 84;
-    <LEFT> = 87;
-    <DOWN> = 85;
-    <RGHT> = 86;
-
-    <KPLP> = 98;
-    <KPRP> = 99;
-    <KPDV> = 100;
-    <KPMU> = 101;
-
-    <KP7>  = 69;
-    <KP8>  = 70;
-    <KP9>  = 71;
-    <KPSU> = 82;
-
-    <KP4>  = 53;
-    <KP5>  = 54;
-    <KP6>  = 55;
-    <KPAD> = 102;
-
-    <KP1>  = 37;
-    <KP2>  = 38;
-    <KP3>  = 39;
-
-    <KP0>  = 23;
-    <KPDC> = 68;
-    <KPEN> = 75;
-};
-
-xkb_keycodes "de" {
-
-    minimum= 8;
-    maximum= 255;
-
-    <ESC>  = 77;
-    <FK01> = 88;
-    <FK02> = 89;
-    <FK03> = 90;
-    <FK04> = 91;
-    <FK05> = 92;
-    <FK06> = 93;
-    <FK07> = 94;
-    <FK08> = 95;
-    <FK09> = 96;
-    <FK10> = 97;
-
-    <TLDE> = 8;
-    <AE01> = 9;
-    <AE02> = 10;
-    <AE03> = 11;
-    <AE04> = 12;
-    <AE05> = 13;
-    <AE06> = 14;
-    <AE07> = 15;
-    <AE08> = 16;
-    <AE09> = 17;
-    <AE10> = 18;
-    <AE11> = 19;
-    <AE12> = 20;
-    <BKSL> = 21;
-    <BKSP> = 73;
-
-    <TAB>  = 74;
-    <AD01> = 24;
-    <AD02> = 25;
-    <AD03> = 26;
-    <AD04> = 27;
-    <AD05> = 28;
-    <AD06> = 29;
-    <AD07> = 30;
-    <AD08> = 31;
-    <AD09> = 32;
-    <AD10> = 33;
-    <AD11> = 34;
-    <AD12> = 35;
-    <RTRN> = 76;
-
-    <LCTL> = 107;
-    <CAPS> = 106;
-    <AC01> = 40;
-    <AC02> = 41;
-    <AC03> = 42;
-    <AC04> = 43;
-    <AC05> = 44;
-    <AC06> = 45;
-    <AC07> = 46;
-    <AC08> = 47;
-    <AC09> = 48;
-    <AC10> = 49;
-    <AC11> = 50;
-    <AC12> = 51;
-
-    <LFSH> = 104;
-    <LSGT> = 56;
-    <AB01> = 57;
-    <AB02> = 58;
-    <AB03> = 59;
-    <AB04> = 60;
-    <AB05> = 61;
-    <AB06> = 62;
-    <AB07> = 63;
-    <AB08> = 64;
-    <AB09> = 65;
-    <AB10> = 66;
-    <RTSH> = 105;
-
-    <LALT> = 108;
-    <LAMI> = 110;
-    <SPCE> = 72;
-    <RAMI> = 111;
-    <RALT> = 109;
-
-    <DELE> = 78;
-    <HELP> = 103;
-    <UP>   = 84;
-    <LEFT> = 87;
-    <DOWN> = 85;
-    <RGHT> = 86;
-
-    <KPLP> = 98;
-    <KPRP> = 99;
-    <KPDV> = 100;
-    <KPMU> = 101;
-
-    <KP7>  = 69;
-    <KP8>  = 70;
-    <KP9>  = 71;
-    <KPSU> = 82;
-
-    <KP4>  = 53;
-    <KP5>  = 54;
-    <KP6>  = 55;
-    <KPAD> = 102;
-
-    <KP1>  = 37;
-    <KP2>  = 38;
-    <KP3>  = 39;
-
-    <KP0>  = 23;
-    <KPDC> = 68;
-    <KPEN> = 75;
-};
+default xkb_keycodes "usa1" {

+

+    minimum= 8;

+    maximum= 255;

+

+    <ESC>  = 77;

+    <FK01> = 88;

+    <FK02> = 89;

+    <FK03> = 90;

+    <FK04> = 91;

+    <FK05> = 92;

+    <FK06> = 93;

+    <FK07> = 94;

+    <FK08> = 95;

+    <FK09> = 96;

+    <FK10> = 97;

+

+    <TLDE> = 8;

+    <AE01> = 9;

+    <AE02> = 10;

+    <AE03> = 11;

+    <AE04> = 12;

+    <AE05> = 13;

+    <AE06> = 14;

+    <AE07> = 15;

+    <AE08> = 16;

+    <AE09> = 17;

+    <AE10> = 18;

+    <AE11> = 19;

+    <AE12> = 20;

+    <BKSL> = 21;

+    <BKSP> = 73;

+

+    <TAB>  = 74;

+    <AD01> = 24;

+    <AD02> = 25;

+    <AD03> = 26;

+    <AD04> = 27;

+    <AD05> = 28;

+    <AD06> = 29;

+    <AD07> = 30;

+    <AD08> = 31;

+    <AD09> = 32;

+    <AD10> = 33;

+    <AD11> = 34;

+    <AD12> = 35;

+    <RTRN> = 76;

+

+    <LCTL> = 107;

+    <CAPS> = 106;

+    <AC01> = 40;

+    <AC02> = 41;

+    <AC03> = 42;

+    <AC04> = 43;

+    <AC05> = 44;

+    <AC06> = 45;

+    <AC07> = 46;

+    <AC08> = 47;

+    <AC09> = 48;

+    <AC10> = 49;

+    <AC11> = 50;

+

+    <LFSH> = 104;

+    <AB01> = 57;

+    <AB02> = 58;

+    <AB03> = 59;

+    <AB04> = 60;

+    <AB05> = 61;

+    <AB06> = 62;

+    <AB07> = 63;

+    <AB08> = 64;

+    <AB09> = 65;

+    <AB10> = 66;

+    <RTSH> = 105;

+

+    <LALT> = 108;

+    <LAMI> = 110;

+    <SPCE> = 72;

+    <RAMI> = 111;

+    <RALT> = 109;

+

+    <DELE> = 78;

+    <HELP> = 103;

+    <UP>   = 84;

+    <LEFT> = 87;

+    <DOWN> = 85;

+    <RGHT> = 86;

+

+    <KPLP> = 98;

+    <KPRP> = 99;

+    <KPDV> = 100;

+    <KPMU> = 101;

+

+    <KP7>  = 69;

+    <KP8>  = 70;

+    <KP9>  = 71;

+    <KPSU> = 82;

+

+    <KP4>  = 53;

+    <KP5>  = 54;

+    <KP6>  = 55;

+    <KPAD> = 102;

+

+    <KP1>  = 37;

+    <KP2>  = 38;

+    <KP3>  = 39;

+

+    <KP0>  = 23;

+    <KPDC> = 68;

+    <KPEN> = 75;

+};

+

+xkb_keycodes "de" {

+

+    minimum= 8;

+    maximum= 255;

+

+    <ESC>  = 77;

+    <FK01> = 88;

+    <FK02> = 89;

+    <FK03> = 90;

+    <FK04> = 91;

+    <FK05> = 92;

+    <FK06> = 93;

+    <FK07> = 94;

+    <FK08> = 95;

+    <FK09> = 96;

+    <FK10> = 97;

+

+    <TLDE> = 8;

+    <AE01> = 9;

+    <AE02> = 10;

+    <AE03> = 11;

+    <AE04> = 12;

+    <AE05> = 13;

+    <AE06> = 14;

+    <AE07> = 15;

+    <AE08> = 16;

+    <AE09> = 17;

+    <AE10> = 18;

+    <AE11> = 19;

+    <AE12> = 20;

+    <BKSL> = 21;

+    <BKSP> = 73;

+

+    <TAB>  = 74;

+    <AD01> = 24;

+    <AD02> = 25;

+    <AD03> = 26;

+    <AD04> = 27;

+    <AD05> = 28;

+    <AD06> = 29;

+    <AD07> = 30;

+    <AD08> = 31;

+    <AD09> = 32;

+    <AD10> = 33;

+    <AD11> = 34;

+    <AD12> = 35;

+    <RTRN> = 76;

+

+    <LCTL> = 107;

+    <CAPS> = 106;

+    <AC01> = 40;

+    <AC02> = 41;

+    <AC03> = 42;

+    <AC04> = 43;

+    <AC05> = 44;

+    <AC06> = 45;

+    <AC07> = 46;

+    <AC08> = 47;

+    <AC09> = 48;

+    <AC10> = 49;

+    <AC11> = 50;

+    <AC12> = 51;

+

+    <LFSH> = 104;

+    <LSGT> = 56;

+    <AB01> = 57;

+    <AB02> = 58;

+    <AB03> = 59;

+    <AB04> = 60;

+    <AB05> = 61;

+    <AB06> = 62;

+    <AB07> = 63;

+    <AB08> = 64;

+    <AB09> = 65;

+    <AB10> = 66;

+    <RTSH> = 105;

+

+    <LALT> = 108;

+    <LAMI> = 110;

+    <SPCE> = 72;

+    <RAMI> = 111;

+    <RALT> = 109;

+

+    <DELE> = 78;

+    <HELP> = 103;

+    <UP>   = 84;

+    <LEFT> = 87;

+    <DOWN> = 85;

+    <RGHT> = 86;

+

+    <KPLP> = 98;

+    <KPRP> = 99;

+    <KPDV> = 100;

+    <KPMU> = 101;

+

+    <KP7>  = 69;

+    <KP8>  = 70;

+    <KP9>  = 71;

+    <KPSU> = 82;

+

+    <KP4>  = 53;

+    <KP5>  = 54;

+    <KP6>  = 55;

+    <KPAD> = 102;

+

+    <KP1>  = 37;

+    <KP2>  = 38;

+    <KP3>  = 39;

+

+    <KP0>  = 23;

+    <KPDC> = 68;

+    <KPEN> = 75;

+};