xserver-xorg-input-elo2300: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 21 +++++++++++++++++++++
ChangeLog | 45 ---------------------------------------------
Makefile.am | 8 ++++++++
configure.ac | 2 +-
man/.cvsignore | 2 --
man/.gitignore | 2 ++
src/.cvsignore | 6 ------
src/.gitignore | 6 ++++++
src/elo.c | 14 +++++++++-----
10 files changed, 47 insertions(+), 78 deletions(-)
New commits:
commit 585245ac87ce421acd890f065dbcb187ed901c1a
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 14:54:57 2008 -0400
elo2300 1.1.2
diff --git a/configure.ac b/configure.ac
index 52fe7b7..5e8bc6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-elo2300],
- 1.1.1,
+ 1.1.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elo2300)
commit 2c8df6b6d097f93c5a8ccd085aa33f09dddde969
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Sat Apr 5 02:29:51 2008 -0300
Don't call xf86GetErrno(), instead use errno directly.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
diff --git a/src/elo.c b/src/elo.c
index d7b1003..5ed67f0 100644
--- a/src/elo.c
+++ b/src/elo.c
@@ -54,6 +54,8 @@
#include "config.h"
#endif
+#include <errno.h>
+
#define _elo_C_
/*****************************************************************************
* Standard Headers
@@ -159,7 +161,7 @@ SetupProc( pointer module,
{
xf86ErrorF ("ELO 2300 driver unable to open device\n");
*errmaj = LDR_NOPORTOPEN;
- *errmin = xf86GetErrno ();
+ *errmin = errno;
goto SetupProc_fail;
}
xf86ErrorFVerb( 6, "tty port opened successfully\n" );
commit e807e5a88af379cad14331b787ed32a45553f8f3
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 30 17:03:05 2008 -0200
Don't call xf86AddLocalDevice and xf86XInputSetSendCoreEvents.
Only call those functions if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.
diff --git a/src/elo.c b/src/elo.c
index f48590c..d7b1003 100644
--- a/src/elo.c
+++ b/src/elo.c
@@ -204,7 +204,9 @@ SetupProc( pointer module,
local->private_flags = 0;
local->history_size = xf86SetIntOption( merged, "HistorySize", 0 );
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
xf86AddLocalDevice (local, merged);
+#endif
/* prepare to process touch packets */
EloNewPacket (priv);
@@ -488,11 +490,13 @@ SwitchMode( ClientPtr client,
priv->reporting_mode = mode;
return (Success);
}
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
else if ((mode == SendCoreEvents) || (mode == DontSendCoreEvents))
{
xf86XInputSetSendCoreEvents (local, (mode == SendCoreEvents));
return (Success);
}
+#endif
else
return (!Success);
}
commit b243a4a8eaadbd7d5115e0a14c494c242b79da80
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:38:03 2007 +0200
Bumped version to 1.1.1.
diff --git a/configure.ac b/configure.ac
index 37dfef1..52fe7b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-elo2300],
- 1.1.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elo2300)
commit 07f187d8c882a853491e5810df9015d4a34ab5b4
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:37:32 2007 +0200
Generate ChangeLog from git.
diff --git a/.gitignore b/.gitignore
index 2df4a8d..d90176e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+ChangeLog
Makefile
Makefile.in
*.la
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index c36fca1..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/elo.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..42f8b54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,11 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+
+CLEANFILES = ChangeLog
+EXTRA_DIST = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
commit 7ce7f2cbe022222a73248a318e75d9c42ca8a5a7
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:06 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit c75cc4de22637732dac647f4cba852af376e09d3
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:24 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 46c3fa9d4f62b6dae97ff598efc3a3a90f470501
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 00:59:15 2007 +0300
Convert from TSCalibrationCtl to AbsCalibCtl
diff --git a/src/elo.c b/src/elo.c
index b928b97..f48590c 100644
--- a/src/elo.c
+++ b/src/elo.c
@@ -455,7 +455,7 @@ static int
ControlProc( LocalDevicePtr local,
xDeviceCtl * control )
{
- xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control;
+ xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control;
EloPrivatePtr priv = (EloPrivatePtr) (local->private);
priv->min_x = c->min_x;
commit 0b7b6b4f17e9e258f546fbe3eb901fea16a4a62c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 00:58:54 2007 +0300
Remove useless debugging statement
diff --git a/src/elo.c b/src/elo.c
index b7b42f6..b928b97 100644
--- a/src/elo.c
+++ b/src/elo.c
@@ -183,8 +183,6 @@ SetupProc( pointer module,
priv->buffer = XisbNew (local->fd, 200);
priv->button_down = FALSE;
- DBG (9, XisbTrace (priv->buffer, 1));
-
EloNewPacket (priv);
if (QueryHardware (priv, errmaj, errmin) != Success)
{
commit c80b29b22a6b30846fd43c6f3e43e70639071c3e
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Aug 6 22:34:31 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
diff --git a/src/elo.c b/src/elo.c
index cbc1c9c..b7b42f6 100644
--- a/src/elo.c
+++ b/src/elo.c
@@ -87,7 +87,7 @@ static XF86ModuleVersionInfo VersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 1, 0,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
Reply to: