xserver-xorg-input-microtouch: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 22 ++++++++++++++++++++++
ChangeLog | 45 ---------------------------------------------
Makefile.am | 8 ++++++++
configure.ac | 2 +-
man/.cvsignore | 2 --
man/.gitignore | 2 ++
man/Makefile.am | 1 -
src/.cvsignore | 6 ------
src/.gitignore | 6 ++++++
src/microtouch.c | 10 ++++++----
11 files changed, 45 insertions(+), 78 deletions(-)
New commits:
commit d17c9694e4f83bdae28c9b6154158823ca1d62b0
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 16:22:05 2008 -0400
microtouch 1.2.0
diff --git a/configure.ac b/configure.ac
index 72f274d..070d52b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-microtouch],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-microtouch)
commit 2116b7e9cb14f695e45eaee462fdbb66bfb6ce22
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:08:51 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 23a5994f7fe30438cb9b081ba203b8417558e746
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 30 17:18:31 2008 -0200
Don't call xf86XInputSetSendCoreEvents.
Only call that function if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.
diff --git a/src/microtouch.c b/src/microtouch.c
index af60a21..b18a22f 100644
--- a/src/microtouch.c
+++ b/src/microtouch.c
@@ -157,7 +157,9 @@ static const char *reqSymbols[] = {
"xf86SetSerial",
"xf86SetStrOption",
"xf86XInputSetScreen",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
"xf86XInputSetSendCoreEvents",
+#endif
"xf86memset",
"xf86sscanf",
"xf86strcmp",
@@ -561,11 +563,13 @@ SwitchMode (ClientPtr client, DeviceIntPtr dev, int mode)
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 e637accb60b5ad8d927529775abbae79aebf5313
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:56:49 2007 +0200
Bumped version to 1.1.1.
diff --git a/configure.ac b/configure.ac
index d306c71..72f274d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-microtouch],
- 1.1.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-microtouch)
commit fdbeee41879b4b0af5908c944ba3c7d02a1bdde4
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:56:30 2007 +0200
Added man/microtouch.? to .gitignore.
diff --git a/.gitignore b/.gitignore
index d90176e..f51da24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ ltmain.sh
missing
stamp-h1
*~
+man/microtouch.?
commit af1c432abdbb12b0888b68cdd64da9a016ba174a
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:55:53 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 2e7abef..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/microtouch.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 53ab4513190e5b1ddb8dd0dc25d187cce15b545e
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:17 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 1bbb12ba2dfaef10a90eff9750e3faf97ccd44f3
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:33 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 f5ab3489df04fc779eb02d578fe4d5ce89a31cf1
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 01:08:57 2007 +0300
Convert from TSCalibrationCtl to AbsCalibCtl
diff --git a/src/microtouch.c b/src/microtouch.c
index c0a3d19..af60a21 100644
--- a/src/microtouch.c
+++ b/src/microtouch.c
@@ -536,7 +536,7 @@ ReadInput (LocalDevicePtr local)
static int
ControlProc (LocalDevicePtr local, xDeviceCtl * control)
{
- xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control;
+ xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control;
MuTPrivatePtr priv = (MuTPrivatePtr) (local->private);
priv->min_x = c->min_x;
commit 4717885202727d16bf9f8712ac4c8bbcab5315df
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 01:08:33 2007 +0300
Remove useless debugging statement
diff --git a/src/microtouch.c b/src/microtouch.c
index c71f59e..c0a3d19 100644
--- a/src/microtouch.c
+++ b/src/microtouch.c
@@ -275,8 +275,6 @@ MuTouchPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
priv->proximity = FALSE;
priv->button_down = FALSE;
- DBG (9, XisbTrace (priv->buffer, 1));
-
MuTNewPacket (priv);
if (QueryHardware(local) != Success)
{
commit 3cafcdec160434abb31bac16673c23b411a15a63
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 09:18:14 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
diff --git a/src/microtouch.c b/src/microtouch.c
index 32578f0..c71f59e 100644
--- a/src/microtouch.c
+++ b/src/microtouch.c
@@ -105,7 +105,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: