Author: branden Date: 2004-04-21 13:09:31 -0500 (Wed, 21 Apr 2004) New Revision: 1300
Modified: trunk/debian/TODO trunk/debian/changelog trunk/debian/patches/000_stolen_from_HEAD.diff Log: Add XKB support for Compaq Evo laptop multimedia keys (patch by Egbert Eich, from XFree86 CVS 2003-09-08). (Closes: #222804) Modified: trunk/debian/TODO =================================================================== --- trunk/debian/TODO 2004-04-21 18:04:56 UTC (rev 1299) +++ trunk/debian/TODO 2004-04-21 18:09:31 UTC (rev 1300) @@ -2,10 +2,6 @@ 4.3.0.dfsg.1-1 née 4.3.0-8 ========================== -* #222804: xlibs: [xkb] proposed symbol mapping for Compaq Evo - patch: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=222804&msg=6 - as reported by Denis Barbier - (http://lists.debian.org/debian-x/2004/debian-x-200404/msg00710.html) * #241034: xlibs: Meta not working and AltGr cancels Compose with xfree86/pc105/{de,fr}/*/altwin:left_meta_win,compose:menu patch: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=241034&msg=18 Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-04-21 18:04:56 UTC (rev 1299) +++ trunk/debian/changelog 2004-04-21 18:09:31 UTC (rev 1300) @@ -289,8 +289,11 @@ the input context. Prevents a SEGV in the ximcp Xlib module (thanks, Chung-chieh Shan). (Closes: #239991) - -- Branden Robinson <[EMAIL PROTECTED]> Wed, 21 Apr 2004 12:16:54 -0500 + * Add XKB support for Compaq Evo laptop multimedia keys (patch by Egbert + Eich, from XFree86 CVS 2003-09-08). (Closes: #222804) + -- Branden Robinson <[EMAIL PROTECTED]> Wed, 21 Apr 2004 13:05:38 -0500 + xfree86 (4.3.0-7) unstable; urgency=medium * Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop. Modified: trunk/debian/patches/000_stolen_from_HEAD.diff =================================================================== --- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-04-21 18:04:56 UTC (rev 1299) +++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-04-21 18:09:31 UTC (rev 1300) @@ -98,6 +98,11 @@ [Don't define PC dvorak keyboards as four-level. From a very large XKB changeset by Ivan Pascal.] +xc/programs/xkbcomp/rules/xfree86.lst @ 3.72 +xc/programs/xkbcomp/rules/xfree86.xml @ 1.14 +xc/programs/xkbcomp/symbols/inet @ 1.33 [PARTIAL] + 436. Added support for the Compaq Evo keyboard (Stanislav Brabec). + diff -urN xc.orig/config/imake/imake.c xc/config/imake/imake.c --- xc.orig/config/imake/imake.c 2002-12-17 09:48:27.000000000 +1100 +++ xc/config/imake/imake.c 2003-04-09 01:58:14.000000000 +1000 @@ -1877,3 +1882,71 @@ key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] }; +Index: programs/xkbcomp/rules/xfree86.lst +=================================================================== +RCS file: /cvs/xc/programs/xkbcomp/rules/xfree86.lst,v +retrieving revision 3.71 +retrieving revision 3.72 +diff -u -r3.71 -r3.72 +--- programs/xkbcomp/rules/xfree86.lst 8 Sep 2003 13:12:36 -0000 3.71 ++++ programs/xkbcomp/rules/xfree86.lst 8 Sep 2003 14:25:31 -0000 3.72 +@@ -4,7 +4,7 @@ + // Rules descriptions for XFree86 + // Copyright 1996 by Joseph Moss + // +-// $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.71 2003/09/08 13:12:36 pascal Exp $ ++// $XFree86: xc/programs/xkbcomp/rules/xfree86.lst,v 3.72 2003/09/08 14:25:31 eich Exp $ + + ! model + pc101 Generic 101-key PC +@@ -36,7 +36,7 @@ + compaqik7 Compaq Internet Keyboard (7 keys) + compaqik13 Compaq Internet Keyboard (13 keys) + compaqik18 Compaq Internet Keyboard (18 keys) +- armada Laptop/notebook Compaq (eg. Armada) Laptop Keyboard ++ armada Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard + presario Laptop/notebook Compaq (eg. Presario) Internet Keyboard + ipaq Compaq iPaq Keyboard + dell Dell +Index: programs/xkbcomp/rules/xfree86.xml +=================================================================== +RCS file: /cvs/xc/programs/xkbcomp/rules/xfree86.xml,v +retrieving revision 1.13 +retrieving revision 1.14 +diff -u -r1.13 -r1.14 +--- programs/xkbcomp/rules/xfree86.xml 8 Sep 2003 13:12:36 -0000 1.13 ++++ programs/xkbcomp/rules/xfree86.xml 8 Sep 2003 14:25:31 -0000 1.14 +@@ -227,7 +227,7 @@ + <model> + <configItem> + <name>armada</name> +- <description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard</description> ++ <description>Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard</description> + <description xml:lang="ru">Клавиатура для компьютеров Compaq (например Armada)</description> + <description xml:lang="uk">Клавіатура для компьютерів Compaq (напр., Armada)</description> + </configItem> +--- xc/programs/xkbcomp/symbols/inet 11 Aug 2003 13:26:09 -0000 1.32 ++++ xc/programs/xkbcomp/symbols/inet 8 Sep 2003 14:25:32 -0000 1.33 +@@ -15,6 +15,8 @@ + // Simple command line usage: + // setxkbmap 'my_kb_layout' -variant 'my_kb_variant' -model 'my_eak_type' + ++// All keyboards listed here should be also mentioned in ++// xc/programs/xkbcomp/rules/xfree86, xfree86.lst and xfree86.xml. + + // Acer + +@@ -411,8 +413,12 @@ + + partial alphanumeric_keys + xkb_symbols "armada" { +- name[Group1]= "Laptop/notebook Compaq (eg. Armada) Laptop Keyboard"; ++ name[Group1]= "Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard"; + ++ key <I6F> { [ XF86AudioMedia ] }; ++ key <I20> { [ XF86AudioMute ] }; ++ key <I2E> { [ XF86AudioLowerVolume ] }; ++ key <I30> { [ XF86AudioRaiseVolume ] }; + key <I23> { [ XF86WWW ] }; + key <I1F> { [ XF86HomePage ] }; + key <I1A> { [ XF86Search ] };
