X Strike Force X.Org X11 SVN commit: r3808 - in trunk/data/xkb-data/debian: . patches
Author: barbier
Date: 2006-10-14 14:59:22 -0400 (Sat, 14 Oct 2006)
New Revision: 3808
Added:
trunk/data/xkb-data/debian/patches/revert_bz8572.diff
Modified:
trunk/data/xkb-data/debian/changelog
trunk/data/xkb-data/debian/patches/series
Log:
debian/patches/revert_bz8572.diff: New patch to revert changes
introduced in BZ8572, they cause trouble with Ctrl-Alt-F*
combinations. Closes: #392911.
Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog 2006-10-14 18:47:43 UTC (rev 3807)
+++ trunk/data/xkb-data/debian/changelog 2006-10-14 18:59:22 UTC (rev 3808)
@@ -1,9 +1,13 @@
-xkeyboard-config (0.9-2) UNRELEASED; urgency=low
+xkeyboard-config (0.9-2) unstable; urgency=low
+ debian/patches/po.diff: Update Hungarian PO file.
- -- Denis Barbier <barbier@debian.org> Sat, 14 Oct 2006 10:54:47 +0200
+ + debian/patches/revert_bz8572.diff: New patch to revert changes
+ introduced in BZ8572, they cause trouble with Ctrl-Alt-F*
+ combinations. Closes: #392911.
+ -- Denis Barbier <barbier@debian.org> Sat, 14 Oct 2006 19:55:14 +0200
+
xkeyboard-config (0.9-1) unstable; urgency=low
* New upstream release.
Added: trunk/data/xkb-data/debian/patches/revert_bz8572.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/revert_bz8572.diff (rev 0)
+++ trunk/data/xkb-data/debian/patches/revert_bz8572.diff 2006-10-14 18:59:22 UTC (rev 3808)
@@ -0,0 +1,70 @@
+debian/patches/revert_bz8572.diff: New patch to revert changes
+ introduced in BZ8572, they cause trouble with Ctrl-Alt-F*
+ combinations. This seems to be an X server bug, but this
+ patch is added until this issue is fixed. Closes: #392911.
+
+Index: xkb-data/symbols/level3
+===================================================================
+--- xkb-data.orig/symbols/level3
++++ xkb-data/symbols/level3
+@@ -14,7 +14,7 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { <RALT> };
++ modifier_map Mod5 { ISO_Level3_Shift };
+ };
+
+ partial modifier_keys
+@@ -55,7 +55,7 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { <LALT> };
++ modifier_map Mod5 { ISO_Level3_Shift };
+ };
+
+ // using the level(switch) map, the right Control key temporarily
+@@ -66,7 +66,7 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { <RCTL> };
++ modifier_map Mod5 { ISO_Level3_Shift };
+ };
+
+ // using the level(menu_switch) map, the Menu key temporarily
+@@ -77,7 +77,7 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { <MENU> };
++ modifier_map Mod5 { ISO_Level3_Shift };
+ };
+
+ // using the level3(win_switch) map, the either Windows' logo key
+@@ -96,7 +96,7 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { <LWIN> };
++ modifier_map Mod5 { ISO_Level3_Shift };
+ };
+
+ // using the level(rwin_switch) map, the right Windows' logo key
+@@ -109,7 +109,7 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { <RWIN> };
++ modifier_map Mod5 { ISO_Level3_Shift };
+ };
+
+ // using the level3(enter_switch) map, the Enter key on the keypad
+@@ -121,5 +121,5 @@
+ type[Group1]="ONE_LEVEL",
+ symbols[Group1] = [ ISO_Level3_Shift ]
+ };
+- modifier_map Mod5 { <KPEN> };
++ modifier_map Mod5 { ISO_Level3_Shift };
+ };
Modified: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series 2006-10-14 18:47:43 UTC (rev 3807)
+++ trunk/data/xkb-data/debian/patches/series 2006-10-14 18:59:22 UTC (rev 3808)
@@ -1,5 +1,6 @@
#cvs.diff
#fix_xkbcomp_crash.diff
+revert_bz8572.diff
po.diff
clean.diff
docs.diff
Reply to: