xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/control | 3 ++-
debian/patches/05_build_with_1_4.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit ab5e06325473febb7af64c601236299af13e61f8
Author: Mattia Dongili <malattia@linux.it>
Date: Mon Sep 17 17:34:32 2007 +0900
Make the driver build with xorg 1.4
- remove DBG usage in evtouch.c
- don't use xf86AlwaysCore as this is taken care in xf86ProcessCommonOption
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/patches/05_build_with_1_4.patch b/debian/patches/05_build_with_1_4.patch
new file mode 100644
index 0000000..3a60d4f
--- /dev/null
+++ b/debian/patches/05_build_with_1_4.patch
@@ -0,0 +1,22 @@
+Index: xserver-xorg-input-evtouch/evtouch.c
+===================================================================
+--- xserver-xorg-input-evtouch.orig/evtouch.c 2007-09-17 17:20:21.736761738 +0900
++++ xserver-xorg-input-evtouch/evtouch.c 2007-09-17 17:31:22.274403633 +0900
+@@ -492,9 +492,6 @@ DeviceOn (DeviceIntPtr dev)
+
+ priv->buffer = XisbNew(local->fd, 64);
+
+- DBG (9, XisbTrace (priv->buffer, 1));
+-
+-
+ if (!priv->buffer)
+ {
+ xf86CloseSerial(local->fd);
+@@ -1207,7 +1204,6 @@ EVTouchPreInit(InputDriverPtr drv, IDevP
+ priv->diff[i][0], priv->diff[i][1]);
+ }
+
+- xf86AlwaysCore(local, TRUE);
+ priv->touch_flags = 0;
+
+ local->history_size = xf86SetIntOption( local->options, "HistorySize", 0 );
diff --git a/debian/patches/series b/debian/patches/series
index 1b48c59..59b87ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
#02-buttonless-device.patch
#03_fix_compile_warns.patch
04_include_xf86_ansic_h.patch
+05_build_with_1_4.patch
commit bbb9a75a9c8134659d9fd860f8ea26326c901eaf
Author: Mattia Dongili <malattia@linux.it>
Date: Mon Sep 17 16:54:11 2007 +0900
Build for server-xorg-core 1.4
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index ac01702..c18974d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xf86-input-evtouch (0.8.7-2) unstable; urgency=low
+
+ * build with xserver-xorg-core 1.4
+
+ -- Mattia Dongili <malattia@debian.org> Mon, 17 Sep 2007 16:52:54 +0900
+
xf86-input-evtouch (0.8.7-1) unstable; urgency=low
* New upstream release:
diff --git a/debian/control b/debian/control
index 55ee014..c031375 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Mattia Dongili <malattia@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.2.99.902), x11proto-randr-dev, libxrender-dev, libx11-dev, quilt
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-randr-dev, libxrender-dev, libx11-dev, quilt
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evtouch
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evtouch.git
@@ -11,6 +11,7 @@ XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evto
Package: xserver-xorg-input-evtouch
Architecture: any
Depends: ${shlibs:Depends}, ${xserver:Depends}
+Provides: ${xinpdriver:Provides}
Description: Touchscreen-Driver for X.Org/XFree86 server
This XFree/X.Org driver provides support for touchscreens input devices.
The driver is actually an evdev-driver which supports events for moving
Reply to: