Author: dnusinow
Date: 2006-04-03 07:40:07 -0500 (Mon, 03 Apr 2006)
New Revision: 1553
Modified:
trunk/debian/MANIFEST.alpha.in
trunk/debian/MANIFEST.amd64.in
trunk/debian/MANIFEST.arm.in
trunk/debian/MANIFEST.hppa.in
trunk/debian/MANIFEST.i386.in
trunk/debian/MANIFEST.ia64.in
trunk/debian/MANIFEST.m68k.in
trunk/debian/MANIFEST.mips.in
trunk/debian/MANIFEST.mipsel.in
trunk/debian/MANIFEST.powerpc.in
trunk/debian/MANIFEST.s390.in
trunk/debian/MANIFEST.sparc.in
trunk/debian/changelog
trunk/debian/patches/arm/300_riscpc_xkb_keycodes.diff
trunk/debian/patches/general/084_xkb_implement_grp:sclk_toggle.diff
trunk/debian/patches/general/086_enable_ca_variants.diff
trunk/debian/patches/general/087_xkb_ralt_switch_multikey.diff
trunk/debian/patches/general/091_xkb_implement_compose:caps.diff
trunk/debian/patches/series
Log:
* Don't apply the evdev rewrite. It pains me to do this, but it's not the
time to be trying to ship and debug new drivers. We've got to get modular
in to etch.
Modified: trunk/debian/MANIFEST.alpha.in
===================================================================
--- trunk/debian/MANIFEST.alpha.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.alpha.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.amd64.in
===================================================================
--- trunk/debian/MANIFEST.amd64.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.amd64.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.arm.in
===================================================================
--- trunk/debian/MANIFEST.arm.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.arm.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.hppa.in
===================================================================
--- trunk/debian/MANIFEST.hppa.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.hppa.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.i386.in
===================================================================
--- trunk/debian/MANIFEST.i386.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.i386.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.ia64.in
===================================================================
--- trunk/debian/MANIFEST.ia64.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.ia64.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.m68k.in
===================================================================
--- trunk/debian/MANIFEST.m68k.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.m68k.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.mips.in
===================================================================
--- trunk/debian/MANIFEST.mips.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.mips.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.mipsel.in
===================================================================
--- trunk/debian/MANIFEST.mipsel.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.mipsel.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.powerpc.in
===================================================================
--- trunk/debian/MANIFEST.powerpc.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.powerpc.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.s390.in
===================================================================
--- trunk/debian/MANIFEST.s390.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.s390.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -130,7 +130,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -149,7 +148,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/MANIFEST.sparc.in
===================================================================
--- trunk/debian/MANIFEST.sparc.in 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/MANIFEST.sparc.in 2006-04-03 12:40:07 UTC (rev 1553)
@@ -135,7 +135,6 @@
etc/X11/xkb/keycodes/ataritt
etc/X11/xkb/keycodes/digital/lk
etc/X11/xkb/keycodes/digital/pc
-etc/X11/xkb/keycodes/evdev
etc/X11/xkb/keycodes/fujitsu
etc/X11/xkb/keycodes/hp
etc/X11/xkb/keycodes/ibm
@@ -154,7 +153,6 @@
etc/X11/xkb/keymap/amiga
etc/X11/xkb/keymap/ataritt
etc/X11/xkb/keymap/digital/us
-etc/X11/xkb/keymap/evdev
etc/X11/xkb/keymap/macintosh
etc/X11/xkb/keymap/sgi/be
etc/X11/xkb/keymap/sgi/bg
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/changelog 2006-04-03 12:40:07 UTC (rev 1553)
@@ -1,9 +1,9 @@
xorg-x11 (6.9.0.dfsg.1-6) unstable; urgency=low
- * Have evdev.h include unistd.h and errno.h to prevent FTBFS on mipsen.
- Thanks Ryan Murray. (closes: #360540)
+ * Disable new evdev driver patches to prevent FTBFS on mipsen. Thanks
+ Ryan Murray. (closes: #360540)
- -- David Nusinow <[EMAIL PROTECTED]> Mon, 3 Apr 2006 00:22:34 -0400
+ -- David Nusinow <[EMAIL PROTECTED]> Mon, 3 Apr 2006 07:18:50 -0400
xorg-x11 (6.9.0.dfsg.1-5) unstable; urgency=high
Modified: trunk/debian/patches/arm/300_riscpc_xkb_keycodes.diff
===================================================================
--- trunk/debian/patches/arm/300_riscpc_xkb_keycodes.diff 2006-04-03
04:23:15 UTC (rev 1552)
+++ trunk/debian/patches/arm/300_riscpc_xkb_keycodes.diff 2006-04-03
12:40:07 UTC (rev 1553)
@@ -9,7 +9,7 @@
Index: xc/programs/xkbcomp/keycodes/riscpc
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ xc/programs/xkbcomp/keycodes/riscpc 2006-02-05 22:00:30.000000000
-0500
++++ xc/programs/xkbcomp/keycodes/riscpc 2006-04-03 08:23:02.000000000
-0400
@@ -0,0 +1,130 @@
+// XFree86 codes for RiscPC
+
@@ -143,14 +143,14 @@
+};
Index: xc/programs/xkbcomp/keycodes/Imakefile
===================================================================
---- xc/programs/xkbcomp/keycodes/Imakefile.orig 2006-02-05
21:58:47.000000000 -0500
-+++ xc/programs/xkbcomp/keycodes/Imakefile 2006-02-05 22:01:04.000000000
-0500
+--- xc/programs/xkbcomp/keycodes/Imakefile.orig 2006-04-03
00:15:25.000000000 -0400
++++ xc/programs/xkbcomp/keycodes/Imakefile 2006-04-03 08:24:26.000000000
-0400
@@ -7,7 +7,7 @@
#define IHaveSubdirs
- DATAFILES = README amiga ataritt fujitsu hp ibm macintosh sony sun \
-+ DATAFILES = README amiga ataritt fujitsu hp ibm macintosh riscpc sony sun
\
- xfree86 xfree98 powerpcps2 aliases evdev
++ DATAFILES = README amiga ataritt fujitsu hp ibm macintosh sony riscpc sun
\
+ xfree86 xfree98 powerpcps2 aliases
SUBDIRS = digital sgi
Modified: trunk/debian/patches/general/084_xkb_implement_grp:sclk_toggle.diff
===================================================================
--- trunk/debian/patches/general/084_xkb_implement_grp:sclk_toggle.diff
2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/patches/general/084_xkb_implement_grp:sclk_toggle.diff
2006-04-03 12:40:07 UTC (rev 1553)
@@ -9,9 +9,9 @@
Index: xc/programs/xkbcomp/rules/xorg
===================================================================
---- xc/programs/xkbcomp/rules/xorg.orig 2006-02-05 21:59:11.000000000
-0500
-+++ xc/programs/xkbcomp/rules/xorg 2006-02-05 21:59:14.000000000 -0500
-@@ -908,6 +908,7 @@
+--- xc/programs/xkbcomp/rules/xorg.orig 2006-04-03 08:22:07.000000000
-0400
++++ xc/programs/xkbcomp/rules/xorg 2006-04-03 08:22:08.000000000 -0400
+@@ -907,6 +907,7 @@
grp:menu_toggle = +group(menu_toggle)
grp:lwin_toggle = +group(lwin_toggle)
grp:rwin_toggle = +group(rwin_toggle)
@@ -21,8 +21,8 @@
grp:lctrl_toggle = +group(lctrl_toggle)
Index: xc/programs/xkbcomp/rules/xorg.lst
===================================================================
---- xc/programs/xkbcomp/rules/xorg.lst.orig 2006-02-05 21:59:11.000000000
-0500
-+++ xc/programs/xkbcomp/rules/xorg.lst 2006-02-05 21:59:14.000000000 -0500
+--- xc/programs/xkbcomp/rules/xorg.lst.orig 2006-04-03 08:21:50.000000000
-0400
++++ xc/programs/xkbcomp/rules/xorg.lst 2006-04-03 08:22:08.000000000 -0400
@@ -357,6 +357,7 @@
grp:menu_toggle Menu key changes group.
grp:lwin_toggle Left Win-key changes group.
@@ -33,8 +33,8 @@
grp:lctrl_toggle Left Ctrl key changes group.
Index: xc/programs/xkbcomp/rules/xorg.xml
===================================================================
---- xc/programs/xkbcomp/rules/xorg.xml.orig 2006-02-05 21:59:11.000000000
-0500
-+++ xc/programs/xkbcomp/rules/xorg.xml 2006-02-05 21:59:14.000000000 -0500
+--- xc/programs/xkbcomp/rules/xorg.xml.orig 2006-04-03 08:21:50.000000000
-0400
++++ xc/programs/xkbcomp/rules/xorg.xml 2006-04-03 08:22:08.000000000 -0400
@@ -7179,6 +7179,14 @@
</option>
<option>
@@ -52,8 +52,8 @@
<description xml:lang="en_GB">Left Shift key changes
group.</description>
Index: xc/programs/xkbcomp/symbols/group
===================================================================
---- xc/programs/xkbcomp/symbols/group.orig 2006-02-05 21:59:11.000000000
-0500
-+++ xc/programs/xkbcomp/symbols/group 2006-02-05 21:59:14.000000000 -0500
+--- xc/programs/xkbcomp/symbols/group.orig 2006-04-03 08:21:50.000000000
-0400
++++ xc/programs/xkbcomp/symbols/group 2006-04-03 08:22:08.000000000 -0400
@@ -215,6 +215,18 @@
};
};
Modified: trunk/debian/patches/general/086_enable_ca_variants.diff
===================================================================
--- trunk/debian/patches/general/086_enable_ca_variants.diff 2006-04-03
04:23:15 UTC (rev 1552)
+++ trunk/debian/patches/general/086_enable_ca_variants.diff 2006-04-03
12:40:07 UTC (rev 1553)
@@ -3,9 +3,9 @@
Index: xc/programs/xkbcomp/rules/xorg
===================================================================
---- xc/programs/xkbcomp/rules/xorg.orig 2006-02-05 21:59:24.000000000
-0500
-+++ xc/programs/xkbcomp/rules/xorg 2006-02-05 21:59:26.000000000 -0500
-@@ -314,8 +314,6 @@
+--- xc/programs/xkbcomp/rules/xorg.orig 2006-04-03 08:22:08.000000000
-0400
++++ xc/programs/xkbcomp/rules/xorg 2006-04-03 08:22:16.000000000 -0400
+@@ -313,8 +313,6 @@
$pcmodels intl = us(%mcompose)
* intl = us(pc104compose)
* jp =
pc/pc(pc102)+pc/jp(latin)+pc/jp:2
Modified: trunk/debian/patches/general/087_xkb_ralt_switch_multikey.diff
===================================================================
--- trunk/debian/patches/general/087_xkb_ralt_switch_multikey.diff
2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/patches/general/087_xkb_ralt_switch_multikey.diff
2006-04-03 12:40:07 UTC (rev 1553)
@@ -3,9 +3,9 @@
Index: xc/programs/xkbcomp/rules/xorg
===================================================================
---- xc/programs/xkbcomp/rules/xorg.orig 2006-02-05 21:59:26.000000000
-0500
-+++ xc/programs/xkbcomp/rules/xorg 2006-02-05 21:59:29.000000000 -0500
-@@ -915,6 +915,7 @@
+--- xc/programs/xkbcomp/rules/xorg.orig 2006-04-03 08:22:16.000000000
-0400
++++ xc/programs/xkbcomp/rules/xorg 2006-04-03 08:22:21.000000000 -0400
+@@ -914,6 +914,7 @@
lv3:switch = +level3(switch)
lv3:ralt_switch = +level3(ralt_switch)
lv3:lalt_switch = +level3(lalt_switch)
@@ -15,8 +15,8 @@
lv3:win_switch = +level3(win_switch)
Index: xc/programs/xkbcomp/rules/xorg.lst
===================================================================
---- xc/programs/xkbcomp/rules/xorg.lst.orig 2006-02-05 21:59:22.000000000
-0500
-+++ xc/programs/xkbcomp/rules/xorg.lst 2006-02-05 21:59:29.000000000 -0500
+--- xc/programs/xkbcomp/rules/xorg.lst.orig 2006-04-03 08:22:08.000000000
-0400
++++ xc/programs/xkbcomp/rules/xorg.lst 2006-04-03 08:22:21.000000000 -0400
@@ -371,6 +371,7 @@
lv3:alt_switch Press any of Alt keys to choose 3rd level.
lv3:lalt_switch Press Left Alt key to choose 3rd level.
@@ -27,8 +27,8 @@
ctrl:swapcaps Swap Control and CapsLock.
Index: xc/programs/xkbcomp/rules/xorg.xml
===================================================================
---- xc/programs/xkbcomp/rules/xorg.xml.orig 2006-02-05 21:59:22.000000000
-0500
-+++ xc/programs/xkbcomp/rules/xorg.xml 2006-02-05 21:59:29.000000000 -0500
+--- xc/programs/xkbcomp/rules/xorg.xml.orig 2006-04-03 08:22:08.000000000
-0400
++++ xc/programs/xkbcomp/rules/xorg.xml 2006-04-03 08:22:21.000000000 -0400
@@ -7344,6 +7344,12 @@
<description xml:lang="vi">Nhấn phím Alt bên phải để chọn ngôn ngữ
thứ 3.</description>
</configItem>
@@ -44,8 +44,8 @@
<!-- Tweaking the position of the "Ctrl" key -->
Index: xc/programs/xkbcomp/symbols/level3
===================================================================
---- xc/programs/xkbcomp/symbols/level3.orig 2006-02-05 21:59:22.000000000
-0500
-+++ xc/programs/xkbcomp/symbols/level3 2006-02-05 21:59:29.000000000 -0500
+--- xc/programs/xkbcomp/symbols/level3.orig 2006-04-03 08:21:49.000000000
-0400
++++ xc/programs/xkbcomp/symbols/level3 2006-04-03 08:22:21.000000000 -0400
@@ -18,6 +18,14 @@
modifier_map Mod5 { ISO_Level3_Shift };
};
Modified: trunk/debian/patches/general/091_xkb_implement_compose:caps.diff
===================================================================
--- trunk/debian/patches/general/091_xkb_implement_compose:caps.diff
2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/patches/general/091_xkb_implement_compose:caps.diff
2006-04-03 12:40:07 UTC (rev 1553)
@@ -9,9 +9,9 @@
Index: xc/programs/xkbcomp/rules/xorg
===================================================================
---- xc/programs/xkbcomp/rules/xorg.orig 2006-02-05 21:59:29.000000000
-0500
-+++ xc/programs/xkbcomp/rules/xorg 2006-02-05 21:59:34.000000000 -0500
-@@ -940,6 +940,7 @@
+--- xc/programs/xkbcomp/rules/xorg.orig 2006-04-03 08:22:21.000000000
-0400
++++ xc/programs/xkbcomp/rules/xorg 2006-04-03 08:22:26.000000000 -0400
+@@ -939,6 +939,7 @@
compose:rwin = +compose(rwin)
compose:menu = +compose(menu)
compose:rctrl = +compose(rctrl)
@@ -21,8 +21,8 @@
eurosign:5 = +eurosign(5)
Index: xc/programs/xkbcomp/rules/xorg.lst
===================================================================
---- xc/programs/xkbcomp/rules/xorg.lst.orig 2006-02-05 21:59:29.000000000
-0500
-+++ xc/programs/xkbcomp/rules/xorg.lst 2006-02-05 21:59:34.000000000 -0500
+--- xc/programs/xkbcomp/rules/xorg.lst.orig 2006-04-03 08:22:21.000000000
-0400
++++ xc/programs/xkbcomp/rules/xorg.lst 2006-04-03 08:22:26.000000000 -0400
@@ -403,6 +403,7 @@
compose:rwin Right Win-key is Compose.
compose:menu Menu is Compose.
@@ -33,8 +33,8 @@
srvrkeys:none Special keys (Ctrl+Alt+<key>) handled in a
server.
Index: xc/programs/xkbcomp/rules/xorg.xml
===================================================================
---- xc/programs/xkbcomp/rules/xorg.xml.orig 2006-02-05 21:59:29.000000000
-0500
-+++ xc/programs/xkbcomp/rules/xorg.xml 2006-02-05 21:59:34.000000000 -0500
+--- xc/programs/xkbcomp/rules/xorg.xml.orig 2006-04-03 08:22:21.000000000
-0400
++++ xc/programs/xkbcomp/rules/xorg.xml 2006-04-03 08:22:26.000000000 -0400
@@ -7922,6 +7922,14 @@
<description xml:lang="vi">Thêm ký hiệu đồng Euro vào phím
2.</description>
</configItem>
@@ -52,8 +52,8 @@
</xkbConfigRegistry>
Index: xc/programs/xkbcomp/symbols/compose
===================================================================
---- xc/programs/xkbcomp/symbols/compose.orig 2006-02-05 21:59:08.000000000
-0500
-+++ xc/programs/xkbcomp/symbols/compose 2006-02-05 21:59:34.000000000
-0500
+--- xc/programs/xkbcomp/symbols/compose.orig 2006-04-03 08:21:49.000000000
-0400
++++ xc/programs/xkbcomp/symbols/compose 2006-04-03 08:22:26.000000000
-0400
@@ -22,3 +22,8 @@
xkb_symbols "rctrl" {
key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2006-04-03 04:23:15 UTC (rev 1552)
+++ trunk/debian/patches/series 2006-04-03 12:40:07 UTC (rev 1553)
@@ -37,8 +37,6 @@
general/030_libvgahw_gcc4_volatile_fix.diff -p0
general/031_disable_libXft1.diff
general/032_fix_matrox_display.diff
-general/033_evdev_rewrite.diff
-general/034_evdev_xkb.diff -p0
general/035_tdfx_disable_dri_on_16mb_with_highres.diff -p0
general/036_geteuid_security.diff -p0
general/041_make_xcursor_icondir_configurable.diff -p0
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
