summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey V. Udaltsov <svu@gnome.org>2008-12-18 13:00:31 +0000
committerSergey V. Udaltsov <svu@gnome.org>2008-12-18 13:00:31 +0000
commit222afd3220e9c920bef41bc2e95886c5d4414d5b (patch)
treecdaff81024b4cab5919c1da1a4a2f49d410d9b42
parenta311521484cc38ab5e3cabb0c2926db50c36e4ea (diff)
downloadxkeyboard-config-222afd3220e9c920bef41bc2e95886c5d4414d5b.tar.gz
dropped goodmap and badmap for apple macbooks, needed only for old broken kernels, b.fd.o#9095
-rw-r--r--ChangeLog6
-rw-r--r--keycodes/macintosh10
-rw-r--r--rules/base.m_k.part1
-rw-r--r--rules/base.o_k.part2
4 files changed, 6 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 9172cee..fd3ccc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-18 Sergey Udaltsov
+
+ * keycodes/macintosh, rules/base.m_k.part, rules/base.o_k.part:
+ dropped the goodmap and badmap keycodes for apple - needed for a very
+ old kernels only. http://bugs.freedesktop.org/show_bug.cgi?id=9095
+
2008-12-17 Sergey Udaltsov
* symbols/capslock, symbols/compose, symbols/ctrl: fix lock modifier
diff --git a/keycodes/macintosh b/keycodes/macintosh
index d1e0be8..d41ac4b 100644
--- a/keycodes/macintosh
+++ b/keycodes/macintosh
@@ -38,16 +38,6 @@ default xkb_keycodes "macintosh" {
};
-xkb_keycodes "badmap" {
- <TLDE> = 94;
- <LSGT> = 49;
-};
-
-xkb_keycodes "goodmap" {
- <TLDE> = 49;
- <LSGT> = 94;
-};
-
xkb_keycodes "old" {
minimum= 8;
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
index a39d4c8..508d5c3 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -10,7 +10,6 @@
olpc = evdev
macintosh_hhk = macintosh(hhk)
macintosh_old = macintosh(old)
- $macbooks = macintosh+macintosh(goodmap)
$macs = macintosh
thinkpadz60 = xfree86(thinkpadz60)
* = xfree86
diff --git a/rules/base.o_k.part b/rules/base.o_k.part
index 53d2879..e69de29 100644
--- a/rules/base.o_k.part
+++ b/rules/base.o_k.part
@@ -1,2 +0,0 @@
- apple:badmap = +macintosh(badmap)
- apple:goodmap = +macintosh(goodmap)