Author: barbier
Date: 2004-09-17 17:28:44 -0500 (Fri, 17 Sep 2004)
New Revision: 1821
Removed:
trunk/debian/patches/087_xkb_fix_altwin.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
Log:
The fix about altwin introduced in 4.3.0.dfsg.1-1 is reverted, Meta_*
keysyms must be removed from shift level of Alt keys when altwin:meta_win
or altwin:left_meta_win are used. Otherwise XKB-unaware applications
may believe that mod1 and mod4 are bound to Meta keys.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-09-17 22:21:45 UTC (rev 1820)
+++ trunk/debian/CHANGESETS 2004-09-17 22:28:44 UTC (rev 1821)
@@ -25,4 +25,10 @@
Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04).
1820
+The fix about altwin introduced in 4.3.0.dfsg.1-1 is reverted, Meta_*
+keysyms must be removed from shift level of Alt keys when altwin:meta_win
+or altwin:left_meta_win are used. Otherwise XKB-unaware applications
+may believe that mod1 and mod4 are bound to Meta keys.
+ 1821
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-09-17 22:21:45 UTC (rev 1820)
+++ trunk/debian/changelog 2004-09-17 22:28:44 UTC (rev 1821)
@@ -8,6 +8,11 @@
* Grab /etc/X11/xkb/symbols/pc/us_intl from XFree86 CVS (2003-10-04).
(Closes: #271326)
+ * The fix about altwin introduced in 4.3.0.dfsg.1-1 is reverted, Meta_*
+ keysyms must be removed from shift level of Alt keys when altwin:meta_win
+ or altwin:left_meta_win are used. Otherwise XKB-unaware applications
+ may believe that mod1 and mod4 are bound to Meta keys.
+
Changes by Branden Robinson:
* In the Xsession script, attempt to create a file of non-zero length in
Deleted: trunk/debian/patches/087_xkb_fix_altwin.diff
===================================================================
--- trunk/debian/patches/087_xkb_fix_altwin.diff 2004-09-17 22:21:45 UTC
(rev 1820)
+++ trunk/debian/patches/087_xkb_fix_altwin.diff 2004-09-17 22:28:44 UTC
(rev 1821)
@@ -1,33 +0,0 @@
-$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.
-
-Submitted to XFree86 by Denis Barbier on 2004-04-22; applied to upstream
-CVS on 2004-05-08 as revision 1.6.
-
---- 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>, 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>, Meta_L };
- };
-
