X Strike Force X.Org X11 SVN commit: r3846 - in trunk/data/xkb-data/debian: . patches
Author: barbier
Date: 2006-10-17 13:49:04 -0400 (Tue, 17 Oct 2006)
New Revision: 3846
Added:
trunk/data/xkb-data/debian/patches/bz8668.diff
Modified:
trunk/data/xkb-data/debian/changelog
trunk/data/xkb-data/debian/patches/series
Log:
debian/patches/bz8668.diff: New patch to fix Ctrl-Alt-Backspace
with Macintosh us layout.
Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog 2006-10-17 17:35:54 UTC (rev 3845)
+++ trunk/data/xkb-data/debian/changelog 2006-10-17 17:49:04 UTC (rev 3846)
@@ -5,6 +5,9 @@
+ debian/patches/po.diff: Update Slovenian PO file.
+ + debian/patches/bz8668.diff: New patch to fix Ctrl-Alt-Backspace
+ with Macintosh us layout.
+
-- Denis Barbier <barbier@debian.org> Sun, 15 Oct 2006 14:45:11 +0200
xkeyboard-config (0.9-2) unstable; urgency=low
Added: trunk/data/xkb-data/debian/patches/bz8668.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/bz8668.diff (rev 0)
+++ trunk/data/xkb-data/debian/patches/bz8668.diff 2006-10-17 17:49:04 UTC (rev 3846)
@@ -0,0 +1,53 @@
+Fixed in CVS.
+
+Index: xkb-data/symbols/macintosh_vndr/us
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/us
++++ xkb-data/symbols/macintosh_vndr/us
+@@ -22,9 +22,7 @@
+ key <AE10> { [ 0, parenright ] };
+ key <AE11> { [ minus, underscore ] };
+ key <AE12> { [ equal, plus ] };
+- key <BKSP> { [ BackSpace ] };
+
+- key <TAB> { [ Tab, ISO_Left_Tab ] };
+ key <AD01> { [ q, Q ] };
+ key <AD02> { [ w, W ] };
+ key <AD03> { [ e, E ] };
+@@ -39,7 +37,6 @@
+ key <AD12> { [ bracketright, braceright ] };
+ key <BKSL> { [ backslash, bar ] };
+
+- key <CAPS> { [ Caps_Lock ] };
+ key <AC01> { [ a, A ] };
+ key <AC02> { [ s, S ] };
+ key <AC03> { [ d, D ] };
+@@ -51,7 +48,6 @@
+ key <AC09> { [ l, L ] };
+ key <AC10> { [ semicolon, colon ] };
+ key <AC11> { [ quoteright, quotedbl ] };
+- key <RTRN> { [ Return ] };
+
+ key <AB01> { [ z, Z ] };
+ key <AB02> { [ x, X ] };
+@@ -67,7 +63,6 @@
+ key <SPCE> { [ space ] };
+ // End alphanumeric section
+
+- key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
+
+ include "keypad"
+
+@@ -111,6 +106,12 @@
+ key <RGHT> { [ Right ] };
+ // End "Editing" section
+
++ key <BKSP> { [ BackSpace ] };
++ key <TAB> { [ Tab, ISO_Left_Tab ] };
++ key <RTRN> { [ Return ] };
++ key <CAPS> { [ Caps_Lock ] };
++ key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] };
++
+ // Begin "Modifier" section
+ key <LFSH> { [ Shift_L ] };
+ key <RTSH> { [ Shift_R ] };
Modified: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series 2006-10-17 17:35:54 UTC (rev 3845)
+++ trunk/data/xkb-data/debian/patches/series 2006-10-17 17:49:04 UTC (rev 3846)
@@ -7,6 +7,7 @@
sclk_toggle.diff
mac_poweroff.diff
bz1576.diff
+bz8668.diff
unhide_lv3_enter_switch.diff
greek.diff
compatibility.diff
Reply to: