diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 16:56:48 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 16:56:48 +0000 |
| commit | cacf63ad6432dd0a50df657b115cc17a22380a23 (patch) | |
| tree | b94151e32617b5c1577326c62a9708947cdc875a | |
| parent | 82d53242c29bd3413cd3f167346d1d9f49a4dc13 (diff) | |
Unlibcwrap. Bump server version requirement. Bump to 2.2.0.xf86-video-impact-0_2_0citron-2_2_0XORG-7_1
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/citron.c | 7 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/citron.c: + Unlibcwrap. Bump server version requirement. Bump to 2.2.0. + 2006-03-01 Peter Kunzmann <kunzmann@citron.de> * man/citron.man: diff --git a/configure.ac b/configure.ac index 08c510c..3ce3686 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-citron], - 2.1.5, + 2.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-citron) @@ -75,7 +75,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages -PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES) sdkdir=$(pkg-config --variable=sdkdir xorg-server) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' diff --git a/src/citron.c b/src/citron.c index 6d30f22..4e90a83 100644 --- a/src/citron.c +++ b/src/citron.c @@ -131,13 +131,15 @@ #include "config.h" #endif +#include <string.h> + #define _citron_C_ #define PK 0 #define INITT 0 /* Initialisation of touch in first loop */ -#define CITOUCH_VERSION 0x215 -char version[]="Touch Driver V2.1.5 (c) 1999-2006 Citron GmbH"; +#define CITOUCH_VERSION 0x220 +char version[]="Touch Driver V2.2.0 (c) 1999-2006 Citron GmbH"; #define CITOUCH_VERSION_MAJOR ((CITOUCH_VERSION >> 8) & 0xf) #define CITOUCH_VERSION_MINOR ((CITOUCH_VERSION >> 4) & 0xf) @@ -151,7 +153,6 @@ char version[]="Touch Driver V2.1.5 (c) 1999-2006 Citron GmbH"; #include "misc.h" #include "xf86.h" #define NEED_XF86_TYPES -#include "xf86_ansic.h" #include "xf86_OSproc.h" /*#include "xf86Optrec.h" */ #include "xf86Xinput.h" |