X Strike Force XFree86 SVN commit: r1524 - in trunk/debian: . patches
Author: branden
Date: 2004-06-08 01:35:29 -0500 (Tue, 08 Jun 2004)
New Revision: 1524
Added:
trunk/debian/patches/090_xkb_fix_uk_macintosh_problems.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
Log:
Fix a few problems with the U.K. Macintosh keyboard layout:
+ Map <TLDE> key to "section, plusminus".
+ Map <LSGT> key to "quoteleft, asciitilde".
+ Map AltGr+<AE02> to "EuroSign".
+ Include group(switch) symbols so that the already-defined mapping
of AltGr+<AE03) to "numbersign" can be used.
(Closes: #201737)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-06-08 00:18:45 UTC (rev 1523)
+++ trunk/debian/CHANGESETS 2004-06-08 06:35:29 UTC (rev 1524)
@@ -141,4 +141,13 @@
(Closes: #247387)
1520
+Fix a few problems with the U.K. Macintosh keyboard layout:
++ Map <TLDE> key to "section, plusminus".
++ Map <LSGT> key to "quoteleft, asciitilde".
++ Map AltGr+<AE02> to "EuroSign".
++ Include group(switch) symbols so that the already-defined mapping
+ of AltGr+<AE03) to "numbersign" can be used.
+(Closes: #201737)
+ 1524
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-06-08 00:18:45 UTC (rev 1523)
+++ trunk/debian/TODO 2004-06-08 06:35:29 UTC (rev 1524)
@@ -20,7 +20,6 @@
* #245246: Apply hot pokers to Ben Collins until we extract a working patch for
XAA and Render support for the sunffb driver. Mmmm, burning manflesh...
(Ben Collins pinged for status on 2004-06-03, and again on 2004-06-07.)
-* #201737: fix U.K. Macintosh keyboard support
* #251310: xlibs: implement compose:caps
4.3.0.dfsg.1-6
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-06-08 00:18:45 UTC (rev 1523)
+++ trunk/debian/changelog 2004-06-08 06:35:29 UTC (rev 1524)
@@ -134,8 +134,16 @@
keymap (patch by Mantas Kriaučiūnas via Vytautas Lukenskas).
(Closes: #247387)
- -- Branden Robinson <branden@debian.org> Mon, 7 Jun 2004 15:58:55 -0500
+ * Fix a few problems with the U.K. Macintosh keyboard layout:
+ + Map <TLDE> key to "section, plusminus".
+ + Map <LSGT> key to "quoteleft, asciitilde".
+ + Map AltGr+<AE02> to "EuroSign".
+ + Include group(switch) symbols so that the already-defined mapping
+ of AltGr+<AE03) to "numbersign" can be used.
+ (Closes: #201737)
+ -- Branden Robinson <branden@debian.org> Tue, 8 Jun 2004 01:17:09 -0500
+
xfree86 (4.3.0.dfsg.1-4) unstable; urgency=medium
* The "thanks for the 'testing'" release.
Added: trunk/debian/patches/090_xkb_fix_uk_macintosh_problems.diff
===================================================================
--- trunk/debian/patches/090_xkb_fix_uk_macintosh_problems.diff 2004-06-08 00:18:45 UTC (rev 1523)
+++ trunk/debian/patches/090_xkb_fix_uk_macintosh_problems.diff 2004-06-08 06:35:29 UTC (rev 1524)
@@ -0,0 +1,49 @@
+$Id$
+
+Fix a few problems with the U.K. Macintosh keyboard layout:
+ * Map <TLDE> key to "section, plusminus".
+ * Map <LSGT> key to "quoteleft, asciitilde".
+ * Map AltGr+<AE02> to "EuroSign".
+ * Include group(switch) symbols so that the already-defined mapping
+ of AltGr+<AE03) to "numbersign" can be used.
+
+Also see Debian #201737.
+
+This patch by Branden Robinson. Thanks to Mark Brown, Frank Murphy, and
+Sebastien Bacher for their assistance.
+
+Not submitted to XFree86.
+
+--- xc/programs/xkbcomp/symbols/macintosh/gb~ 2004-05-31 10:46:48.000000000 -0500
++++ xc/programs/xkbcomp/symbols/macintosh/gb 2004-05-31 11:06:13.000000000 -0500
+@@ -1,19 +1,20 @@
+ // $XConsortium: gb /main/3 1996/08/31 12:19:51 kaleb $
+ // $XFree86: xc/programs/xkbcomp/symbols/macintosh/gb,v 1.1 2000/09/19 12:46:25 eich Exp $
+-partial default alphanumeric_keys
+-xkb_symbols "basic" {
+
+- // Describes the differences between a very simple en_US
+- // keyboard and a very simple U.K. keyboard layout
++partial default alphanumeric_keys
++xkb_symbols "basic" {
+
++ // Describe the differences between a U.S. Extended Macintosh keyboard
++ // and a U.K. Extended Macintosh keyboard.
+
+- name[Group1]= "Great Britain";
++ name[Group1]="Great Britain";
+
+- key <AE03> { [ 3, sterling ],
++ key <TLDE> { [ section, plusminus ] };
++ key <AE02> { [],
++ [ EuroSign ] };
++ key <AE03> { [ 3, sterling ],
+ [ numbersign ] };
++ key <LSGT> { [ quoteleft, asciitilde ] };
+
+- // End alphanumeric section
+-
++ include "group(switch)"
+ };
+-
+-
Property changes on: trunk/debian/patches/090_xkb_fix_uk_macintosh_problems.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: