X Strike Force XFree86 SVN commit: r1404 - in trunk/debian: . patches
Author: branden
Date: 2004-05-13 16:42:44 -0500 (Thu, 13 May 2004)
New Revision: 1404
Added:
trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Split updates to XKB data from XFree86 CVS out into their own patch file
because we may end up incorporating a lot of them.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-13 19:54:32 UTC (rev 1403)
+++ trunk/debian/CHANGESETS 2004-05-13 21:42:44 UTC (rev 1404)
@@ -88,4 +88,8 @@
Merge #000_stolen_from_HEAD_doc_extensions_fix into #000_stolen_from_HEAD.
1403
+Split updates to XKB data from XFree86 CVS out into their own patch file because
+we may end up incorporating a lot of them.
+ 1404
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-05-13 19:54:32 UTC (rev 1403)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-05-13 21:42:44 UTC (rev 1404)
@@ -60,10 +60,6 @@
60. Fix for spontaneous repeated keyboard events during sync grab (#A.1713,
Michal Marüka).
-xc/programs/xkbcomp/symbols/pc/be @ 1.3
- 92. Add keys missed in multi-layout keyboard maps: LSGT key in Belgian map
- [...] (Ivan Pascal).
-
xc/nls/Compose/en_US.UTF-8 @ 1.9
50. Add convenient ways to enter "double quote" and "cedilla" with the
en_US.UTF-8 compose rules (Alexandre Oliva).
@@ -88,15 +84,6 @@
xc/programs/Xserver/dix/events.c @ 3.52
Fix a crash when xkb is disabled. [Matthieu Herrb]
-xc/programs/xkbcomp/symbols/pc/dvorak @ 1.2 [PARTIAL]
- [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).
-
xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c @ 1.14
xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h @ 1.9
163. Add an entry to the i2c module that drivers can call to retrieve an array
@@ -983,17 +970,6 @@
return FALSE;
i = checkFirst;
-diff -u -p -r1.2 -r1.3
---- xc/programs/xkbcomp/symbols/pc/be 2002/11/22 04:03:28 1.2
-+++ xc/programs/xkbcomp/symbols/pc/be 2003/04/12 10:53:48 1.3
-@@ -40,6 +40,7 @@
- key <AB08> { [ semicolon, period, horizconnector, multiply ] };
- key <AB09> { [ colon, slash, periodcentered, division ] };
- key <AB10> { [ equal, plus, dead_tilde, dead_abovedot] };
-+ key <LSGT> { [ less, greater, backslash, backslash ] };
-
- key <RALT> { type[Group1]="TWO_LEVEL",
- [ ISO_Level3_Shift, Multi_key ] };
Index: xc/nls/Compose/en_US.UTF-8
===================================================================
RCS file: /cvs/xc/nls/Compose/en_US.UTF-8,v
@@ -1869,57 +1845,6 @@
<Multi_key> <exclam> <uhorn> : "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
<dead_belowdot> <dead_horn> <u> : "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
<dead_belowdot> <Multi_key> <plus> <u> : "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
---- xc/programs/xkbcomp/symbols/pc/dvorak 26 Nov 2002 01:43:25 -0000 1.1
-+++ xc/programs/xkbcomp/symbols/pc/dvorak 19 Apr 2003 12:22:11 -0000 1.2
-@@ -9,7 +9,6 @@
- name[Group1]= "Dvorak";
-
- // Alphanumeric section
-- key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
-
- key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
-
-diff -urN xc/programs/xkbcomp~/rules/xfree86.lst xc/programs/xkbcomp/rules/xfree86.lst
---- xc/programs/xkbcomp~/rules/xfree86.lst 2004-04-21 13:20:53.000000000 -0500
-+++ xc/programs/xkbcomp/rules/xfree86.lst 2004-04-21 13:22:37.000000000 -0500
-@@ -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
-diff -urN xc/programs/xkbcomp~/rules/xfree86.xml xc/programs/xkbcomp/rules/xfree86.xml
---- xc/programs/xkbcomp~/rules/xfree86.xml 2004-04-21 13:20:53.000000000 -0500
-+++ xc/programs/xkbcomp/rules/xfree86.xml 2004-04-21 13:22:55.000000000 -0500
-@@ -200,7 +200,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>
- </configItem>
- </model>
-diff -urN xc/programs/xkbcomp~/symbols/inet xc/programs/xkbcomp/symbols/inet
---- xc/programs/xkbcomp~/symbols/inet 2003-02-26 14:08:43.000000000 -0500
-+++ xc/programs/xkbcomp/symbols/inet 2004-04-21 13:24:26.000000000 -0500
-@@ -373,8 +373,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 ] };
Index: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v
Added: trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-05-13 19:54:32 UTC (rev 1403)
+++ trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff 2004-05-13 21:42:44 UTC (rev 1404)
@@ -0,0 +1,83 @@
+$Id$
+
+This file is for XKB data. This basically means any subdirectory of
+xc/programs/xkbcomp. Changes within xc/program/xkbcomp itself should not
+be here, nor should changes elsewhere in the tree.
+
+Comments by Branden Robinson are made in [brackets].
+
+xc/programs/xkbcomp/symbols/pc/be @ 1.3
+ 92. Add keys missed in multi-layout keyboard maps: LSGT key in Belgian map
+ [...] (Ivan Pascal).
+
+xc/programs/xkbcomp/symbols/pc/dvorak @ 1.2 [PARTIAL]
+ [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 -u -p -r1.2 -r1.3
+--- xc/programs/xkbcomp/symbols/pc/be 2002/11/22 04:03:28 1.2
++++ xc/programs/xkbcomp/symbols/pc/be 2003/04/12 10:53:48 1.3
+@@ -40,6 +40,7 @@
+ key <AB08> { [ semicolon, period, horizconnector, multiply ] };
+ key <AB09> { [ colon, slash, periodcentered, division ] };
+ key <AB10> { [ equal, plus, dead_tilde, dead_abovedot] };
++ key <LSGT> { [ less, greater, backslash, backslash ] };
+
+ key <RALT> { type[Group1]="TWO_LEVEL",
+ [ ISO_Level3_Shift, Multi_key ] };
+--- xc/programs/xkbcomp/symbols/pc/dvorak 26 Nov 2002 01:43:25 -0000 1.1
++++ xc/programs/xkbcomp/symbols/pc/dvorak 19 Apr 2003 12:22:11 -0000 1.2
+@@ -9,7 +9,6 @@
+ name[Group1]= "Dvorak";
+
+ // Alphanumeric section
+- key.type[Group1] = "FOUR_LEVEL_ALPHABETIC";
+
+ key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
+
+diff -urN xc/programs/xkbcomp~/rules/xfree86.lst xc/programs/xkbcomp/rules/xfree86.lst
+--- xc/programs/xkbcomp~/rules/xfree86.lst 2004-04-21 13:20:53.000000000 -0500
++++ xc/programs/xkbcomp/rules/xfree86.lst 2004-04-21 13:22:37.000000000 -0500
+@@ -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
+diff -urN xc/programs/xkbcomp~/rules/xfree86.xml xc/programs/xkbcomp/rules/xfree86.xml
+--- xc/programs/xkbcomp~/rules/xfree86.xml 2004-04-21 13:20:53.000000000 -0500
++++ xc/programs/xkbcomp/rules/xfree86.xml 2004-04-21 13:22:55.000000000 -0500
+@@ -200,7 +200,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>
+ </configItem>
+ </model>
+diff -urN xc/programs/xkbcomp~/symbols/inet xc/programs/xkbcomp/symbols/inet
+--- xc/programs/xkbcomp~/symbols/inet 2003-02-26 14:08:43.000000000 -0500
++++ xc/programs/xkbcomp/symbols/inet 2004-04-21 13:24:26.000000000 -0500
+@@ -373,8 +373,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 ] };
Property changes on: trunk/debian/patches/000_stolen_from_HEAD_xkb_data.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: