debian/changelog | 9 ++
debian/patches/revert-goodmap-badmap-for-apple.diff | 63 ++++++++++++++++++++
debian/patches/series | 1
3 files changed, 73 insertions(+)
New commits:
commit f51f684014dce27bef2750f09f185e2ade4c40dd
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Nov 23 21:48:39 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index deb9327..90485d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ xkeyboard-config (1.8-2) unstable; urgency=low
this issue, so restore those options for now (Closes: #604671). Thanks,
Corsac, for reporting and checking the fix!
- -- Cyril Brulebois <k...@debian.org> Tue, 23 Nov 2010 19:10:26 +0100
+ -- Cyril Brulebois <k...@debian.org> Tue, 23 Nov 2010 21:48:24 +0100
xkeyboard-config (1.8-1) unstable; urgency=low
commit fff7590a28f73d53fb09d31ca681f47a823cf884
Author: Cyril Brulebois <k...@debian.org>
Date: Tue Nov 23 19:15:44 2010 +0100
Add revert-goodmap-badmap-for-apple.diff patch to make apple:goodmap and
apple:badmap options available again.
Some users are still affected by this issue, so restore those options for
now
(Closes: #604671). Thanks, Corsac, for reporting and checking the fix!
diff --git a/debian/changelog b/debian/changelog
index 6acd2eb..deb9327 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xkeyboard-config (1.8-2) unstable; urgency=low
+
+ * Add revert-goodmap-badmap-for-apple.diff patch to make apple:goodmap and
+ apple:badmap options available again. Some users are still affected by
+ this issue, so restore those options for now (Closes: #604671). Thanks,
+ Corsac, for reporting and checking the fix!
+
+ -- Cyril Brulebois <k...@debian.org> Tue, 23 Nov 2010 19:10:26 +0100
+
xkeyboard-config (1.8-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/revert-goodmap-badmap-for-apple.diff
b/debian/patches/revert-goodmap-badmap-for-apple.diff
new file mode 100644
index 0000000..140c43a
--- /dev/null
+++ b/debian/patches/revert-goodmap-badmap-for-apple.diff
@@ -0,0 +1,63 @@
+From 64387d5598e5c72a3d8fef0b31444c02df2f2cb2 Mon Sep 17 00:00:00 2001
+From: Cyril Brulebois <k...@debian.org>
+Date: Tue, 23 Nov 2010 19:06:10 +0100
+Subject: [PATCH] Revert "dropped goodmap and badmap for apple macbooks, needed
only for old broken kernels, b.fd.o#9095"
+
+Since kernels may not have a proper fix, keep those options available.
+
+This reverts commit 222afd3220e9c920bef41bc2e95886c5d4414d5b.
+
+Conflicts:
+
+ ChangeLog
+
+Signed-off-by: Cyril Brulebois <k...@debian.org>
+---
+ keycodes/macintosh | 10 ++++++++++
+ rules/base.m_k.part | 1 +
+ rules/base.o_k.part | 2 ++
+ 3 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/keycodes/macintosh b/keycodes/macintosh
+index d41ac4b..d1e0be8 100644
+--- a/keycodes/macintosh
++++ b/keycodes/macintosh
+@@ -38,6 +38,16 @@ 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 dd0c391..794994c 100644
+--- a/rules/base.m_k.part
++++ b/rules/base.m_k.part
+@@ -10,6 +10,7 @@
+ 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 e69de29..53d2879 100644
+--- a/rules/base.o_k.part
++++ b/rules/base.o_k.part
+@@ -0,0 +1,2 @@
++ apple:badmap = +macintosh(badmap)
++ apple:goodmap = +macintosh(goodmap)
+--
+1.7.2.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 1975efa..85f937c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
docs.diff
+revert-goodmap-badmap-for-apple.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pl00k-0006dl...@alioth.debian.org
