X Strike Force XFree86 SVN commit: r1945 - in trunk/debian: . patches
Author: barbier
Date: 2004-10-12 11:09:53 -0500 (Tue, 12 Oct 2004)
New Revision: 1945
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
Log:
In /etc/X11/xkb/rules/xfree86, move lv3 definitions after altwin so
that the former can override the latter. See Bug#276143.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-10-12 12:19:48 UTC (rev 1944)
+++ trunk/debian/CHANGESETS 2004-10-12 16:09:53 UTC (rev 1945)
@@ -118,4 +118,8 @@
Shift+Alt_R or Alt_R+Shift. (Closes: #270235)
1943, 1944
+In /etc/X11/xkb/rules/xfree86, move lv3 definitions after altwin so
+that the former can override the latter. See Bug#276143.
+ 1945
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-10-12 12:19:48 UTC (rev 1944)
+++ trunk/debian/changelog 2004-10-12 16:09:53 UTC (rev 1945)
@@ -78,6 +78,9 @@
layouts so that symbols on the 4th column may be accessed with
Shift+Alt_R or Alt_R+Shift. (Closes: #270235)
+ + In /etc/X11/xkb/rules/xfree86, move lv3 definitions after altwin so
+ that the former can override the latter. See Bug#276143.
+
Changes by Fabio M. Di Nitto:
* Update wacom input driver from http://linuxwacom.sourceforge.net/ up to
Modified: trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff
===================================================================
--- trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-10-12 12:19:48 UTC (rev 1944)
+++ trunk/debian/patches/099z_xkb_fix_rules_xfree86.diff 2004-10-12 16:09:53 UTC (rev 1945)
@@ -11,6 +11,8 @@
+ Support the lv3:ralt_switch option, which exists in xfree86.lst but was
forgotten in this file.
+ Add support for a lv3:ralt_switch_multikey option.
+ + Move lv3 definitions after altwin so that the former can override
+ the latter. See Bug#276143.
rules/xfree86.{lst,xml}:
+ Replace the options altwin:meta_super and altwin:meta_hyper with the
@@ -29,15 +31,32 @@
// If you want non-latin layouts implicitly include the en_US layout
// uncomment lines below
-@@ -159,6 +159,8 @@
- lv3:win_switch = +level3(win_switch)
- lv3:lwin_switch = +level3(lwin_switch)
- lv3:rwin_switch = +level3(rwin_switch)
-+ lv3:ralt_switch = +level3(ralt_switch)
-+ lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
+@@ -154,11 +154,6 @@
+ grp:lctrl_toggle = +group(lctrl_toggle)
+ grp:rctrl_toggle = +group(rctrl_toggle)
+ grp:lalt_toggle = +group(lalt_toggle)
+- lv3:switch = +level3(switch)
+- lv3:menu_switch = +level3(menu_switch)
+- lv3:win_switch = +level3(win_switch)
+- lv3:lwin_switch = +level3(lwin_switch)
+- lv3:rwin_switch = +level3(rwin_switch)
ctrl:nocaps = +ctrl(nocaps)
ctrl:swapcaps = +ctrl(swapcaps)
ctrl:ctrl_ac = +ctrl(ctrl_ac)
+@@ -169,6 +164,13 @@
+ altwin:left_meta_win = +altwin(left_meta_win)
+ altwin:super_win = +altwin(super_win)
+ altwin:hyper_win = +altwin(hyper_win)
++ lv3:switch = +level3(switch)
++ lv3:menu_switch = +level3(menu_switch)
++ lv3:win_switch = +level3(win_switch)
++ lv3:lwin_switch = +level3(lwin_switch)
++ lv3:rwin_switch = +level3(rwin_switch)
++ lv3:ralt_switch = +level3(ralt_switch)
++ lv3:ralt_switch_multikey = +level3(ralt_switch_multikey)
+ compose:ralt = +compose(ralt)
+ compose:rwin = +compose(rwin)
+ compose:menu = +compose(menu)
diff -ruN xc-old/programs/xkbcomp/rules/xfree86.lst xc/programs/xkbcomp/rules/xfree86.lst
--- xc-old/programs/xkbcomp/rules/xfree86.lst 2004-10-12 08:58:00.000000000 +0000
+++ xc/programs/xkbcomp/rules/xfree86.lst 2004-10-12 09:08:58.000000000 +0000
Reply to: