Author: barbier
Date: 2006-08-31 02:25:05 -0400 (Thu, 31 Aug 2006)
New Revision: 3161
Added:
trunk/data/xkb-data/debian/patches/macbook_keycodes.diff
Modified:
trunk/data/xkb-data/debian/changelog
trunk/data/xkb-data/debian/patches/mac_level3.diff
trunk/data/xkb-data/debian/patches/resync_rules_base.diff
trunk/data/xkb-data/debian/patches/series
Log:
xkeyboard-config (0.8-10) unstable; urgency=low
* Really fix Mac nodeadkeys variants, rules/base was not properly
rebuilt.
Modified: trunk/data/xkb-data/debian/changelog
===================================================================
--- trunk/data/xkb-data/debian/changelog 2006-08-31 04:30:18 UTC (rev
3160)
+++ trunk/data/xkb-data/debian/changelog 2006-08-31 06:25:05 UTC (rev
3161)
@@ -1,3 +1,10 @@
+xkeyboard-config (0.8-10) unstable; urgency=low
+
+ * Really fix Mac nodeadkeys variants, rules/base was not properly
+ rebuilt.
+
+ -- Denis Barbier <[EMAIL PROTECTED]> Thu, 31 Aug 2006 00:30:25 +0200
+
xkeyboard-config (0.8-9) unstable; urgency=low
* debian/patches/resync_rules_base.diff: New patch to help keeping
Modified: trunk/data/xkb-data/debian/patches/mac_level3.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/mac_level3.diff 2006-08-31 04:30:18 UTC
(rev 3160)
+++ trunk/data/xkb-data/debian/patches/mac_level3.diff 2006-08-31 06:25:05 UTC
(rev 3161)
@@ -311,7 +311,7 @@
- [ dead_grave ] };
+ key <BKSL> { [ numbersign, apostrophe, dead_grave
] };
- include "keypad(comma)"
+ key <KPDL> { [ KP_Separator, KP_Delete ] };
+ include "level3(ralt_switch)"
- // begin modifier mappings
@@ -560,7 +560,7 @@
===================================================================
--- xkb-data.orig/symbols/macintosh_vndr/fr
+++ xkb-data/symbols/macintosh_vndr/fr
-@@ -26,114 +26,61 @@
+@@ -26,159 +26,63 @@
key <ESC> { [ Escape ] };
// Alphanumeric section
@@ -727,11 +727,17 @@
+ key <SPCE> { [ space, space, nobreakspace, nobreakspace
] };
// End alphanumeric section
- // Begin modifier mappings
-@@ -147,38 +94,6 @@
- key <RALT> { [ script_switch ] };
- // End modifier mappings
-
+- // Begin modifier mappings
+- key <LWIN> { [ Alt_L, Meta_L ] };
+- key <LFSH> { [ Shift_L ] };
+- key <LCTL> { [ Control_L ] };
+- key <LALT> { [ Mode_switch ] };
+- key <RMTA> { [ Meta_R ] };
+- key <RTSH> { [ Shift_R ] };
+- key <RCTL> { [ Control_R ] };
+- key <RALT> { [ script_switch ] };
+- // End modifier mappings
+-
- // Begin "Function" section
- key <FK01> { [ F1 ] };
- key <FK02> { [ F2 ] };
@@ -767,7 +773,7 @@
// Begin "Keypad" section
key <KPCL> { [ Clear ] };
key <KPEQ> { [ KP_Equal ] };
-@@ -204,15 +119,7 @@
+@@ -204,15 +108,7 @@
key <KPDL> { [ comma,KP_Decimal ] };
// End "Keypad" section
@@ -1302,7 +1308,7 @@
+ key <BKSL> { [ apostrophe, asterisk, at
] };
+ key <LSGT> { [ less, greater, bar,
brokenbar ] };
- include "keypad(comma)"
+ key <KPDL> { [ KP_Separator, KP_Delete ] };
+ include "level3(ralt_switch)"
};
Added: trunk/data/xkb-data/debian/patches/macbook_keycodes.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/macbook_keycodes.diff 2006-08-31
04:30:18 UTC (rev 3160)
+++ trunk/data/xkb-data/debian/patches/macbook_keycodes.diff 2006-08-31
06:25:05 UTC (rev 3161)
@@ -0,0 +1,49 @@
+Some new Mac keyboards have two keycodes swapped.
+Let's introduce a new model for now.
+
+Not submitted yet, but partially discussed in
+ https://bugs.freedesktop.org/show_bug.cgi?id=8068
+
+Index: xkb-data/keycodes/macintosh
+===================================================================
+--- xkb-data.orig/keycodes/macintosh
++++ xkb-data/keycodes/macintosh
+@@ -37,6 +37,13 @@
+ <KPEQ> = 157;
+
+ };
++
++xkb_keycodes "macbook" {
++ include "macintosh"
++ <TLDE> = 94;
++ <LSGT> = 49;
++};
++
+ xkb_keycodes "old" {
+
+ minimum= 8;
+Index: xkb-data/rules/base.m_k.part
+===================================================================
+--- xkb-data.orig/rules/base.m_k.part
++++ xkb-data/rules/base.m_k.part
+@@ -3,6 +3,7 @@
+ sun4 = sun(type4_euro)
+ sun5 = sun(type5_euro)
+ macintosh_old = macintosh(old)
++ macbook = macintosh(macbook)
+ macintosh = macintosh
+ powerpcps2 = powerpcps2
+ pc98 = xfree98(pc98)
+Index: xkb-data/rules/base.lists.part
+===================================================================
+--- xkb-data.orig/rules/base.lists.part
++++ xkb-data/rules/base.lists.part
+@@ -10,7 +10,7 @@
+ ! $pcgeometries = abnt2 latitude microsoft jp106 kr106
+
+ ! $maclaptop = ibook powerbook
+-! $mac = macintosh macintosh_old ibook powerbook
++! $mac = macintosh macintosh_old ibook powerbook macbook
+
+ ! $macvendorlayouts = ch de dk es fi fr gb is it nl no pt se us
+
Modified: trunk/data/xkb-data/debian/patches/resync_rules_base.diff
===================================================================
--- trunk/data/xkb-data/debian/patches/resync_rules_base.diff 2006-08-31
04:30:18 UTC (rev 3160)
+++ trunk/data/xkb-data/debian/patches/resync_rules_base.diff 2006-08-31
06:25:05 UTC (rev 3161)
@@ -5,9 +5,9 @@
rm -f base.l[2-4]*.part base.m*.part
make
cd ..
- quilt add base base.xml base.lst
- rm -f base base.xml base.lst
- make base base.xml base.lst
+ quilt add base base.lst
+ rm -f base base.lst
+ make base base.lst
cd ..
quilt refresh --sort
exit 0
@@ -63,6 +63,15 @@
microsoftpro = microsoft(natural)
microsoftprousb = microsoft(natural)
microsoftprose = microsoft(natural)
+@@ -205,7 +208,7 @@
+ * yu yz = pc(pc105)+srp(latinyz)
+ $pcmodels yu unicodeyz =
pc(%m)+srp(latinunicodeyz)
+ * yu unicodeyz =
pc(pc105)+srp(latinunicodeyz)
+- $mac $macvendorlayouts nodeadkeys =
macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
++ $mac $macvendorlayouts nodeadkeys =
pc(pc105)+macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
+
+ ! model layout = symbols
+ $pcmodels ar = pc(%m)+ara
@@ -352,11 +355,11 @@
sun5 * =
latin+sun_vndr/us(sun5)+%l%(v)
pc98 nec_vndr/jp = nec_vndr/jp(pc98)
Modified: trunk/data/xkb-data/debian/patches/series
===================================================================
--- trunk/data/xkb-data/debian/patches/series 2006-08-31 04:30:18 UTC (rev
3160)
+++ trunk/data/xkb-data/debian/patches/series 2006-08-31 06:25:05 UTC (rev
3161)
@@ -12,4 +12,5 @@
#mac_level3.diff
latin_quotes.diff
mac_nodeadkeys.diff
+#macbook_keycodes.diff
resync_rules_base.diff
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
