diff options
author | Adam Jackson <ajax@nwnk.net> | 2006-04-07 17:40:06 +0000 |
---|---|---|
committer | Adam Jackson <ajax@nwnk.net> | 2006-04-07 17:40:06 +0000 |
commit | 57ab5f2de3bd4de1987b436822acdb7e7ef23dc5 (patch) | |
tree | 87245901429adc8e47be1252b42b95c327fb4526 | |
parent | c6d37e34b58991b68cccb2d098cce963e68ffd09 (diff) |
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.xf86-video-impact-0_2_0joystick-1_1_0XORG-7_1
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | src/xf86Jstk.c | 3 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2006-04-06 Adam Jackson <ajax@freedesktop.org> + + * configure.ac: + * src/xf86Jstk.c: + Unlibcwrap. Bump server version requirement. Bump to 1.1.0. + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/configure.ac b/configure.ac index 86cf9b2..33f072a 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-joystick], - 1.0.0.5, + 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-joystick) @@ -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/xf86Jstk.c b/src/xf86Jstk.c index 7d764ea..dcdf177 100644 --- a/src/xf86Jstk.c +++ b/src/xf86Jstk.c @@ -39,7 +39,6 @@ #include <misc.h> #include <xf86.h> -#include <xf86_ansic.h> #include <xf86_OSproc.h> #include <xf86Xinput.h> #include <xisb.h> @@ -775,7 +774,7 @@ static XF86ModuleVersionInfo xf86JstkVersionRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - 1, 0, 0, + 1, 1, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, MOD_CLASS_XINPUT, |