debian/changelog | 6 ++++
debian/patches/100_fix_crash_on_uninit.diff | 34 ++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 41 insertions(+)
New commits:
commit 08f6ed015069db15b09cb9d913147a1ecfe97186
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Fri Mar 18 15:57:16 2011 +0200
Add patch 100_fix_crash_on_uninit.diff (LP: #727543)
diff --git a/debian/changelog b/debian/changelog
index 0f6c09d..4b22867 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-joystick (1:1.5.99+git20101214.8c7ad54d-0ubuntu2) natty;
urgency=low
+
+ * Add patch 100_fix_crash_on_uninit.diff (LP: #727543)
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 18 Mar 2011 15:56:09 +0200
+
xserver-xorg-input-joystick (1:1.5.99+git20101214.8c7ad54d-0ubuntu1) natty;
urgency=low
* New upstream snapshot. Fixes build against Xserver 1.10
diff --git a/debian/patches/100_fix_crash_on_uninit.diff
b/debian/patches/100_fix_crash_on_uninit.diff
new file mode 100644
index 0000000..548f52e
--- /dev/null
+++ b/debian/patches/100_fix_crash_on_uninit.diff
@@ -0,0 +1,34 @@
+From 9c43e041e18a4675d833d72f3d654fe1ee5e6e2e Mon Sep 17 00:00:00 2001
+From: Timo Aaltonen <timo.aalto...@canonical.com>
+Date: Fri, 18 Mar 2011 14:49:03 +0200
+Subject: [PATCH joystick] Remove old input ABI leftovers from jstkCoreUnInit
+
+Fixes crashes on device unplug:
+https://bugs.freedesktop.org/show_bug.cgi?id=35391
+
+Signed-off-by: Timo Aaltonen <timo.aalto...@canonical.com>
+---
+ src/jstk.c | 7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/src/jstk.c b/src/jstk.c
+index 9796a46..41cace7 100644
+--- a/src/jstk.c
++++ b/src/jstk.c
+@@ -622,13 +622,6 @@ jstkCoreUnInit(InputDriverPtr drv,
+ {
+ JoystickDevPtr device = (JoystickDevPtr) pInfo->private;
+
+- if (device->keyboard_device != NULL)
+- {
+- xf86DisableDevice(device->keyboard_device->dev, TRUE);
+- device->keyboard_device = NULL;
+- }
+-
+- free (device);
+ pInfo->private = NULL;
+ xf86DeleteInput(pInfo, 0);
+ }
+--
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..dd2bce2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+100_fix_crash_on_uninit.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/e1q0acm-0001es...@alioth.debian.org
