Author: branden
Date: 2004-04-21 13:29:29 -0500 (Wed, 21 Apr 2004)
New Revision: 1301
Modified:
trunk/debian/patches/000_stolen_from_HEAD.diff
Log:
Fix botched snarf of patches from XFree86 CVS; backport them instead.
Modified: trunk/debian/patches/000_stolen_from_HEAD.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD.diff 2004-04-21 18:09:31 UTC
(rev 1300)
+++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-04-21 18:29:29 UTC
(rev 1301)
@@ -1882,23 +1882,9 @@
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
+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)
@@ -1908,36 +1894,23 @@
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 @@
+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>
- <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'
+ </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 @@
-+// 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";
