Author: branden
Date: 2004-04-21 13:47:44 -0500 (Wed, 21 Apr 2004)
New Revision: 1302
Added:
trunk/debian/patches/087_xkb_fix_altwin.diff
Modified:
trunk/debian/TODO
trunk/debian/changelog
Log:
Fix the altwin:meta_win and altwin:left_meta_win XKB options to not
override current definitions of Alt keys or the Mod1 modifier map (thanks,
Denis Barbier). (Closes: #234081)
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-04-21 18:29:29 UTC (rev 1301)
+++ trunk/debian/TODO 2004-04-21 18:47:44 UTC (rev 1302)
@@ -2,10 +2,6 @@
4.3.0.dfsg.1-1 née 4.3.0-8
==========================
-* #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
- as reported by Denis Barbier (same reference as above)
Post 4.3.0-1
============
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-21 18:29:29 UTC (rev 1301)
+++ trunk/debian/changelog 2004-04-21 18:47:44 UTC (rev 1302)
@@ -292,8 +292,12 @@
* 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
+ * Fix the altwin:meta_win and altwin:left_meta_win XKB options to not
+ override current definitions of Alt keys or the Mod1 modifier map (thanks,
+ Denis Barbier). (Closes: #234081)
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 21 Apr 2004 13:46:08 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Added: trunk/debian/patches/087_xkb_fix_altwin.diff
===================================================================
--- trunk/debian/patches/087_xkb_fix_altwin.diff 2004-04-21 18:29:29 UTC
(rev 1301)
+++ trunk/debian/patches/087_xkb_fix_altwin.diff 2004-04-21 18:47:44 UTC
(rev 1302)
@@ -0,0 +1,32 @@
+$Id$
+
+Fix the altwin:meta_win and altwin:left_meta_win XKB options to not
+override current definitions of Alt keys or the Mod1 modifier map. See
+Debian #234081 and #241034.
+
+This patch by Denis Barbier.
+
+Not submitted to XFree86.
+
+--- xc/programs/xkbcomp/symbols/altwin.orig 2004-04-17 00:46:14.000000000
+0200
++++ xc/programs/xkbcomp/symbols/altwin 2004-04-17 00:47:24.000000000 +0200
+@@ -10,19 +10,14 @@
+
+ partial modifier_keys
+ xkb_symbols "meta_win" {
+- key <LALT> { [ Alt_L, Alt_L ] };
+- key <RALT> { [ Alt_R, Alt_R ] };
+ key <LWIN> { [ Meta_L ] };
+ key <RWIN> { [ Meta_R ] };
+- modifier_map Mod1 { Alt_L, Alt_R };
+ modifier_map Mod4 { Meta_L, Meta_R };
+ };
+
+ partial modifier_keys
+ xkb_symbols "left_meta_win" {
+- key <LALT> { [ Alt_L, Alt_L ] };
+ key <LWIN> { [ Meta_L ] };
+- modifier_map Mod1 { Alt_L };
+ modifier_map Mod4 { Meta_L };
+ };
+
Property changes on: trunk/debian/patches/087_xkb_fix_altwin.diff
___________________________________________________________________
Name: svn:keywords
+ Id
