Author: branden Date: 2004-04-16 22:36:15 -0500 (Fri, 16 Apr 2004) New Revision: 1268
Modified: trunk/debian/changelog trunk/debian/patches/000_stolen_from_HEAD.diff Log: Fix problem with shift key misbehaving when caps lock active on PC keyboards using the Dvorak layout: don't define such keyboards as four-level (patch by Ivan Pascal, from XFree86 CVS 2003-04-19 via Denis Barbier). (Closes: #242987) Modified: trunk/debian/changelog =================================================================== --- trunk/debian/changelog 2004-04-17 02:43:19 UTC (rev 1267) +++ trunk/debian/changelog 2004-04-17 03:36:15 UTC (rev 1268) @@ -251,8 +251,13 @@ initializing properly every other time the X server is started (patch by Hui Yu of ATI, from XFree86 Bugzilla #673). (Closes: #243575) - -- Branden Robinson <[EMAIL PROTECTED]> Fri, 16 Apr 2004 21:35:31 -0500 + * Fix problem with shift key misbehaving when caps lock active on PC + keyboards using the Dvorak layout: don't define such keyboards as + four-level (patch by Ivan Pascal, from XFree86 CVS 2003-04-19 via Denis + Barbier). (Closes: #242987) + -- Branden Robinson <[EMAIL PROTECTED]> Fri, 16 Apr 2004 22:25:32 -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-17 02:43:19 UTC (rev 1267) +++ trunk/debian/patches/000_stolen_from_HEAD.diff 2004-04-17 03:36:15 UTC (rev 1268) @@ -94,6 +94,10 @@ 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 + [Don't define PC dvorak keyboards as four-level. From a very large XKB + changeset by Ivan Pascal. Only part of this revision has been used.] + 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 @@ -1863,3 +1867,13 @@ <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 ] }; +