xorg-server: Changes to 'ubuntu'
debian/changelog | 9 ++
debian/patches/130_fedora_call_switchcorekeyboard.patch | 61 ----------------
debian/patches/series | 3
3 files changed, 11 insertions(+), 62 deletions(-)
New commits:
commit 9a97ecdb6fbb50c7b0699f8faa584c059ec463ee
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Aug 6 13:45:18 2008 +0300
Add a couple of patches from Fedora to allow clients to change the layout.
added;
130_fedora_fix_procxkbsetxyz_to_work_on_all.patch
136_fedora_force_switchcorekeyboard_for_evdev.patch
dropped;
130_fedora_call_switchcorekeyboard.patch
diff --git a/debian/changelog b/debian/changelog
index 8a7f15b..21011b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.4.99.906-1ubuntu3) intrepid; urgency=low
+
+ * 130_fedora_fix_procxkbsetxyz_to_work_on_all.patch
+ 136_fedora_force_switchcorekeyboard_for_evdev.patch
+ - Allow clients to set the layout.
+ * Drop 130_fedora_call_switchcorekeyboard.patch, obsoleted.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Wed, 06 Aug 2008 13:30:28 +0300
+
xorg-server (2:1.4.99.906-1ubuntu2) intrepid; urgency=low
* Add 135_rethrow_signals.patch
diff --git a/debian/patches/130_fedora_call_switchcorekeyboard.patch b/debian/patches/130_fedora_call_switchcorekeyboard.patch
deleted file mode 100644
index 304d79e..0000000
--- a/debian/patches/130_fedora_call_switchcorekeyboard.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From b2943b507261d1c68a6266b090ec44495d7796a1 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 28 Jul 2008 12:17:17 +0930
-Subject: [PATCH] xfree86: call SwitchCoreKeyboard for first physical device.
-
-The VCK's keymap is different to the (evdev) keyboard's keymap. Any changes to
-the VCK are lost when the first key is pressed (see X.Org Bug 16364). By
-calling SwitchCoreKeyboard for the first hotplugged keyboard, the keymap is
-toggled already when the first apps start.
-
-This fixes GNOME, which stores the keycode instead of the keysym.
-Fixes xmodmap, etc. settings in xinitrc or otherwise set before the first key
-press.
-
-This breaks if the first hotplugged keyboard is not the actual keyboard the
-user wants to use.
----
- hw/xfree86/common/xf86Xinput.c | 27 +++++++++++++++++++++++++++
- 1 files changed, 27 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
-index 710e787..fe08626 100644
---- a/hw/xfree86/common/xf86Xinput.c
-+++ b/hw/xfree86/common/xf86Xinput.c
-@@ -423,6 +423,33 @@ NewInputDeviceRequest (InputOption *options, DeviceIntPtr *pdev)
- (!is_auto || xf86Info.autoEnableDevices))
- EnableDevice(dev);
-
-+ /* XXX: The VCK always starts with built-in defaults for keymap. These
-+ * defaults are different to the evdev ones. When the first key is hit on
-+ * an extension device, the keymap is copied into the VCK's and any
-+ * changes made at runtime to the VCK map are lost.
-+ *
-+ * If this is the first real keyboard to activate, force a
-+ * SwitchCoreKeyboard so the VCK has the same keymap as we do.
-+ *
-+ * Next time we hit a key, we don't change the map over anymore (see
-+ * SwitchCoreKeyboard), and live happily ever after.
-+ * Until we have 2 physical keyboards. Or the first real keyboard isn't
-+ * actually the one we use. Oh well.
-+ */
-+ if (dev->key)
-+ {
-+ DeviceIntPtr it;
-+
-+ for (it = inputInfo.keyboard->next; it; it = it->next)
-+ {
-+ if (it->key && it != dev)
-+ break;
-+ }
-+
-+ if (!it) /* no other keyboard found */
-+ SwitchCoreKeyboard(dev);
-+ }
-+
- *pdev = dev;
- return Success;
-
---
-1.5.5.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 16fc637..7cbcc6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,9 +9,10 @@
110_fedora_no_move_damage.patch
121_only_switch_vt_when_active.diff
123_no_composite_for_xvfb_run.patch
-130_fedora_call_switchcorekeyboard.patch
+130_fedora_fix_procxkbsetxyz_to_work_on_all.patch
131_remove_open-coded_strcasestr.patch
132_add_parsing_for_xkb.options.patch
133_support_strlist_for_xkboptions.patch
134_protect_against_out_of_bounds.patch
135_rethrow_signals.patch
+136_fedora_force_switchcorekeyboard_for_evdev.patch
Reply to: