xserver-xorg-input-evdev: Changes to 'ubuntu'
debian/changelog | 13 +++++++++++++
debian/patches/101_64bit_safe_testbit.patch | 15 +++++++++++++++
debian/patches/series | 1 +
3 files changed, 29 insertions(+)
New commits:
commit 2c32f9f43d994bae8a3e00287f421084bbeac004
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Oct 21 18:29:51 2008 +0300
101_64bit_safe_testbit.patch: On amd64 evdev would be used for joysticks
because TestBit would return a wrong value. (LP: #284951)
also add the previous changelog entry.
diff --git a/debian/changelog b/debian/changelog
index b35a808..d754e2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+xserver-xorg-input-evdev (1:2.0.99+git20080912-0ubuntu6) intrepid; urgency=low
+
+ * 101_64bit_safe_testbit.patch: On amd64 evdev would be used for joysticks
+ because TestBit would return a wrong value. (LP: #284951)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 21 Oct 2008 18:23:09 +0300
+
+xserver-xorg-input-evdev (1:2.0.99+git20080912-0ubuntu5) intrepid; urgency=low
+
+ * Rebuild against new x11proto-input-dev.
+
+ -- William Grant <wgrant@ubuntu.com> Sat, 18 Oct 2008 21:13:47 +1100
+
xserver-xorg-input-evdev (1:2.0.99+git20080912-0ubuntu4) intrepid; urgency=low
* Cherry-pick commit 7243116f from upstream, "Don't post keycodes > 255."
diff --git a/debian/patches/101_64bit_safe_testbit.patch b/debian/patches/101_64bit_safe_testbit.patch
new file mode 100644
index 0000000..3b2ac04
--- /dev/null
+++ b/debian/patches/101_64bit_safe_testbit.patch
@@ -0,0 +1,15 @@
+http://bugs.freedesktop.org/show_bug.cgi?id=18150
+
+Index: xserver-xorg-input-evdev/src/evdev.c
+===================================================================
+--- xserver-xorg-input-evdev.orig/src/evdev.c 2008-10-21 18:20:00.000000000 +0300
++++ xserver-xorg-input-evdev/src/evdev.c 2008-10-21 18:20:22.000000000 +0300
+@@ -410,7 +410,7 @@
+ }
+ }
+
+-#define TestBit(bit, array) (array[(bit) / LONG_BITS]) & (1 << ((bit) % LONG_BITS))
++#define TestBit(bit, array) (array[(bit) / LONG_BITS]) & (1l << ((bit) % LONG_BITS))
+
+ static void
+ EvdevPtrCtrlProc(DeviceIntPtr device, PtrCtrl *ctrl)
diff --git a/debian/patches/series b/debian/patches/series
index 9f81b21..48504d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
100_dont_check_abi.patch
+101_64bit_safe_testbit.patch
Reply to: