xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog | 3 +-
debian/patches/04_server-1.7-ftbfs.diff | 31 +++++++++++------------
debian/patches/05_fix_CURSORDIR.diff | 4 +-
debian/patches/06_add_TSC-10_to_evdev_rules.diff | 4 +-
4 files changed, 22 insertions(+), 20 deletions(-)
New commits:
commit 6df11d7f2b0f98f54dedb6de3e93bc351d63f7a5
Author: Mattia Dongili <malattia@linux.it>
Date: Sun Feb 14 14:30:44 2010 +0900
Close FTBFS and pkg uninstallable bugs
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 184ff43..38cb962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
xf86-input-evtouch (0.8.8-2) unstable; urgency=low
[ Mattia Dongili ]
- * Fix building and rebuild with xorg 1.7
+ * Fix building and rebuild with xorg 1.7 (Closes: #569444 and Closes:
+ #569523)
* Switch to dpkg-source 3.0 (quilt) format
* add 05_fix_CURSORDIR.diff to let ev_calibrate find empty_cursor.xpm
(Closes: #482195)
commit 09cb8d214e47f64ff8c5a5ae446204472dbfe71b
Author: Mattia Dongili <malattia@linux.it>
Date: Sun Feb 14 13:44:27 2010 +0900
Bah, building the package also helps...
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/patches/04_server-1.7-ftbfs.diff b/debian/patches/04_server-1.7-ftbfs.diff
index a68c22c..726297c 100644
--- a/debian/patches/04_server-1.7-ftbfs.diff
+++ b/debian/patches/04_server-1.7-ftbfs.diff
@@ -10,8 +10,8 @@ Date: Sun Jan 24 15:45:51 2010 +0900
Index: xserver-xorg-input-evtouch/evtouch.c
===================================================================
---- xserver-xorg-input-evtouch.orig/evtouch.c 2010-02-13 20:16:09.802485295 +0900
-+++ xserver-xorg-input-evtouch/evtouch.c 2010-02-13 20:16:10.330503893 +0900
+--- xserver-xorg-input-evtouch.orig/evtouch.c 2010-02-14 14:08:33.000000000 +0900
++++ xserver-xorg-input-evtouch/evtouch.c 2010-02-14 14:13:51.000000000 +0900
@@ -57,6 +57,7 @@
#define NEED_EVENTS
#include <X11/X.h>
@@ -227,7 +227,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
ioctl(local->fd, EVIOCGRAB, (void *)0);
xf86RemoveEnabledDevice (local);
if (priv->buffer)
-@@ -577,6 +643,72 @@
+@@ -577,6 +643,73 @@
}
@@ -243,6 +243,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
+ labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+ labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+
++ return labels;
+#endif
+}
+
@@ -300,7 +301,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
static Bool
-@@ -585,6 +717,7 @@
+@@ -585,6 +718,7 @@
DBGOUT(2, "EVTouch: %s\n", __FUNCTION__);
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private);
@@ -308,7 +309,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
unsigned char map[EV_MAX_BUTTONS];
int i;
-@@ -593,7 +726,7 @@
+@@ -593,7 +727,7 @@
priv->btn_count = EV_MAX_BUTTONS;
@@ -317,7 +318,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
* these have to be here instead of in the SetupProc, because when the
* SetupProc is run at server startup, screenInfo is not setup yet
*/
-@@ -603,9 +736,9 @@
+@@ -603,9 +737,9 @@
priv->screen_height = pScrn->virtualY;
priv->pViewPort_X0 = &(pScrn->frameX0); /* initialize the pointers to the viewport coords */
if ( (priv->screen_width != priv->phys_width) ||
@@ -329,7 +330,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
priv->virtual = 0;
priv->pViewPort_Y0 = &(pScrn->frameY0);
-@@ -620,24 +753,29 @@
+@@ -620,24 +754,29 @@
DBGOUT(2, "EVTouch: MaxValue H,V: %d %d\n", pScrn->maxHValue, pScrn->maxVValue);
priv->screen_width = screenInfo.screens[priv->screen_num]->width;
@@ -341,7 +342,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
* Device reports button press for 5 buttons.
*/
- if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE)
-+ labels = EvtouchInitButtonLabels(labels);
++ labels = EvtouchInitButtonLabels();
+ if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ labels,
@@ -367,7 +368,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
priv->btn_count);
if (InitFocusClassDeviceStruct(dev) == FALSE) {
-@@ -645,13 +783,18 @@
+@@ -645,13 +784,18 @@
return !Success;
}
@@ -387,7 +388,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
#endif
local->history_size, Absolute) == FALSE)
{
-@@ -660,12 +803,20 @@
+@@ -660,12 +804,20 @@
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
@@ -410,7 +411,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
1024,
EV_AXIS_MIN_RES /* min_res */ ,
EV_AXIS_MAX_RES /* max_res */ );
-@@ -682,7 +833,6 @@
+@@ -682,7 +834,6 @@
priv->raw_y=priv->cur_y;
libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y);
@@ -418,7 +419,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
if (InitProximityClassDeviceStruct (dev) == FALSE)
{
ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
-@@ -695,7 +845,7 @@
+@@ -695,7 +846,7 @@
return !Success;
}
@@ -427,7 +428,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
* Allocate the motion events buffer.
*/
xf86MotionHistoryAllocate (local);
-@@ -765,7 +915,7 @@
+@@ -765,7 +916,7 @@
if (sizeof(priv->ev) == count) {
count = 0;
EVTouchDumpPacketToLog(priv);
@@ -438,8 +439,8 @@ Index: xserver-xorg-input-evtouch/evtouch.c
}
Index: xserver-xorg-input-evtouch/evtouch.h
===================================================================
---- xserver-xorg-input-evtouch.orig/evtouch.h 2010-02-13 20:15:16.638486406 +0900
-+++ xserver-xorg-input-evtouch/evtouch.h 2010-02-13 20:16:10.330503893 +0900
+--- xserver-xorg-input-evtouch.orig/evtouch.h 2010-02-14 14:01:43.000000000 +0900
++++ xserver-xorg-input-evtouch/evtouch.h 2010-02-14 14:08:34.000000000 +0900
@@ -35,6 +35,22 @@
#define DBGOUT(lvl, ...)
#endif
diff --git a/debian/patches/05_fix_CURSORDIR.diff b/debian/patches/05_fix_CURSORDIR.diff
index b65a250..89a46e4 100644
--- a/debian/patches/05_fix_CURSORDIR.diff
+++ b/debian/patches/05_fix_CURSORDIR.diff
@@ -2,8 +2,8 @@ The code uses CURSORDIRECTORY but the build rules define CURSORDIR.
Index: xserver-xorg-input-evtouch/ev_calibrate.c
===================================================================
---- xserver-xorg-input-evtouch.orig/ev_calibrate.c 2010-02-13 20:16:09.314986596 +0900
-+++ xserver-xorg-input-evtouch/ev_calibrate.c 2010-02-13 20:23:01.855013365 +0900
+--- xserver-xorg-input-evtouch.orig/ev_calibrate.c 2010-02-14 14:08:33.000000000 +0900
++++ xserver-xorg-input-evtouch/ev_calibrate.c 2010-02-14 14:14:06.000000000 +0900
@@ -16,8 +16,8 @@
#include "ev_calibrate.h"
#include "config.h"
diff --git a/debian/patches/06_add_TSC-10_to_evdev_rules.diff b/debian/patches/06_add_TSC-10_to_evdev_rules.diff
index b0ede77..f123097 100644
--- a/debian/patches/06_add_TSC-10_to_evdev_rules.diff
+++ b/debian/patches/06_add_TSC-10_to_evdev_rules.diff
@@ -2,8 +2,8 @@ Add TSC-10 to udev's rules
Index: xserver-xorg-input-evtouch/69-touchscreen.rules
===================================================================
---- xserver-xorg-input-evtouch.orig/69-touchscreen.rules 2010-02-13 20:15:16.486486580 +0900
-+++ xserver-xorg-input-evtouch/69-touchscreen.rules 2010-02-13 20:23:04.967002000 +0900
+--- xserver-xorg-input-evtouch.orig/69-touchscreen.rules 2010-01-24 20:28:30.000000000 +0900
++++ xserver-xorg-input-evtouch/69-touchscreen.rules 2010-02-14 14:14:09.000000000 +0900
@@ -50,3 +50,5 @@
KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="LBPS/2 Fujitsu Lifebook TouchScreen", SYMLINK+="input/evtouch_event"
# Elo Touchscreen
Reply to: