xorg-server: Changes to 'debian-unstable'
debian/changelog | 8 +++-----
debian/patches/15_keyboard_leds.diff | 24 ------------------------
debian/patches/series | 1 -
3 files changed, 3 insertions(+), 30 deletions(-)
New commits:
commit 4a73074e7ffe0ede7640448455dda72300bd867b
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Nov 6 18:36:42 2007 +0100
Remove patch 15_keyboard_leds.diff
A different fix is already upstream.
diff --git a/debian/changelog b/debian/changelog
index f896305..2387fda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,6 @@ xorg-server (2:1.4.1~git20071105-1) unstable; urgency=low
* Add conflict on xserver-xorg-input-wacom (<< 0.7.8) to xserver-xorg-core.
That driver is built against the old ABI, but doesn't provide
xserver-xorg-input.
- * New patch 15_keyboard_leds.diff by Paulo César Pereira de Andrade
- <pcpa@mandriva.com.br> from upstream bug#12434 to fix keyboard leds.
- The problem should be fixed properly in 1.4.1, but this patch will do for
- now (closes: #440743 and its pile of duplicates).
[ David Nusinow ]
* Add 14_default_screen_section.diff. This allows you to not have a screen
@@ -29,11 +25,13 @@ xorg-server (2:1.4.1~git20071105-1) unstable; urgency=low
[ David Nusinow ]
* New upstream stable snapshot
+ + fixes a bunch of input-related bugs, notably keyboard leds
+ (closes: #440743 and its pile of duplicates)
* Remove patches merged in this snapshot
+ 42_fix_RemoveGeneralSocket_crash_from_dbus.diff
+ 44_XKB_mapping_changes_for_all_core-sending_devices.diff
- -- David Nusinow <dnusinow@debian.org> Mon, 05 Nov 2007 22:42:36 -0500
+ -- Julien Cristau <jcristau@debian.org> Tue, 06 Nov 2007 18:34:24 +0100
xorg-server (2:1.4-3) unstable; urgency=low
diff --git a/debian/patches/15_keyboard_leds.diff b/debian/patches/15_keyboard_leds.diff
deleted file mode 100644
index 73cd4a0..0000000
--- a/debian/patches/15_keyboard_leds.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-This patch by Paulo César Pereira de Andrade <pcpa@mandriva.com.br>
-
-http://bugs.freedesktop.org/show_bug.cgi?id=12434
-
---- xorg-server-1.4/dix/devices.c.orig 2007-10-19 17:04:51.000000000 -0200
-+++ xorg-server-1.4/dix/devices.c 2007-10-23 17:50:38.000000000 -0200
-@@ -294,7 +294,17 @@ CoreKeyboardBell(int volume, DeviceIntPt
- static void
- CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
- {
-+#ifdef XKB
-+ if (!noXkbExtension) {
-+ DeviceIntPtr dev = (DeviceIntPtr)
-+ pDev->devPrivates[CoreDevicePrivatesIndex].ptr;
-+
-+ if (dev && dev->key && dev->key->xkbInfo && dev->key->xkbInfo->kbdProc)
-+ (*dev->key->xkbInfo->kbdProc)(dev, ctrl);
-+ }
-+#else
- return;
-+#endif
- }
-
- /**
diff --git a/debian/patches/series b/debian/patches/series
index 204137d..2208bd6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,6 @@
12_bgPixel_fix_64bit_issue.diff
13_debian_add_xkbpath_env_variable.diff
14_default_screen_section.diff
-15_keyboard_leds.diff
21_glx_align_fixes.patch
41_vbe_filter_less.diff
43_allow_override_BIOS_EDID_preferred_mode.diff
Reply to: