[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r3113 - in trunk/data/xkb-data/debian: . patches



Author: barbier
Date: 2006-08-29 18:00:57 -0400 (Tue, 29 Aug 2006)
New Revision: 3113

Added:
   trunk/data/xkb-data/debian/patches/mac_swap_kp.diff
Modified:
   trunk/data/xkb-data/debian/changelog
   trunk/data/xkb-data/debian/patches/series
Log:
* debian/patches/mac_swap_kp.diff: New patch to swap KP_Delete and
  KP_Separator on Mac keyboards.  Closes: #328125  Thanks Ben Mueller


Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog	2006-08-29 21:51:18 UTC (rev 3112)
+++ trunk/data/xkb-data/debian/changelog	2006-08-29 22:00:57 UTC (rev 3113)
@@ -3,6 +3,9 @@
   * debian/patches/resync_rules_base.diff: New patch to help keeping
     rules/base.* and rules/compat/base.* files up-to-date.
 
+  * debian/patches/mac_swap_kp.diff: New patch to swap KP_Delete and
+    KP_Separator on Mac keyboards.  Closes: #328125  Thanks Ben Mueller
+
  -- Denis Barbier <barbier@debian.org>  Tue, 29 Aug 2006 23:00:50 +0200
 
 xkeyboard-config (0.8-8) unstable; urgency=low

Added: trunk/data/xkb-data/debian/patches/mac_swap_kp.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/mac_swap_kp.diff	2006-08-29 21:51:18 UTC (rev 3112)
+++ trunk/data/xkb-data/debian/patches/mac_swap_kp.diff	2006-08-29 22:00:57 UTC (rev 3113)
@@ -0,0 +1,31 @@
+This bug has been forwarded upstream
+  https://bugs.freedesktop.org/show_bug.cgi?id=6671
+Upstream decided to add a de(mac) variant so that keypad
+works like on PC.  For now, let's also fix mac keypad.
+
+Index: xkb-data/symbols/macintosh_vndr/de
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/de
++++ xkb-data/symbols/macintosh_vndr/de
+@@ -87,7 +87,7 @@
+     key <BKSL> {	[ numbersign,	apostrophe	],
+ 			[ dead_grave			]	};
+ 
+-    include "keypad(comma)"
++    key <KPDL> {	[ KP_Separator, KP_Delete	]	};
+ 
+     // begin modifier mappings
+ //    modifier_map Shift  { Shift_L };
+Index: xkb-data/symbols/macintosh_vndr/se
+===================================================================
+--- xkb-data.orig/symbols/macintosh_vndr/se
++++ xkb-data/symbols/macintosh_vndr/se
+@@ -45,7 +45,7 @@
+     key <LSGT> {        [            less,         greater      ],
+                         [             bar,       brokenbar      ]       };
+ 
+-    include "keypad(comma)"
++    key <KPDL> {	[ KP_Separator, KP_Delete	]	};
+ };
+ 
+ 

Modified: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series	2006-08-29 21:51:18 UTC (rev 3112)
+++ trunk/data/xkb-data/debian/patches/series	2006-08-29 22:00:57 UTC (rev 3113)
@@ -8,5 +8,6 @@
 ralt_switch_multikey.diff
 microsoft.diff
 inet.diff
+mac_swap_kp.diff
+#mac_level3.diff
 resync_rules_base.diff
-#mac_level3.diff



Reply to: