xserver-xorg-input-penmount: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 22 ++++++++++++++++++++++
ChangeLog | 54 ------------------------------------------------------
Makefile.am | 8 ++++++++
configure.ac | 2 +-
man/.cvsignore | 2 --
man/.gitignore | 2 ++
src/.cvsignore | 6 ------
src/.gitignore | 6 ++++++
src/xf86PM.c | 6 +++++-
10 files changed, 44 insertions(+), 83 deletions(-)
New commits:
commit d66c0b070d6a80b7b5d98cf364149fbc2df81fac
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 16:40:15 2008 -0400
penmount 1.3.0
diff --git a/configure.ac b/configure.ac
index a207053..b245f5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-penmount],
- 1.2.1,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-penmount)
commit 600e029c61c012c7a7eb1075a805fbc01681962a
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 30 17:37:28 2008 -0200
Don't call xf86XInputSetSendCoreEvents.
Only call that function if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.
diff --git a/src/xf86PM.c b/src/xf86PM.c
index 0a6d1ad..612b68b 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -121,7 +121,9 @@ static const char *reqSymbols[] = {
"xf86SetIntOption",
"xf86SetStrOption",
"xf86XInputSetScreen",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
"xf86XInputSetSendCoreEvents",
+#endif
NULL
};
@@ -786,11 +788,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 (pInfo, (mode == SendCoreEvents));
return (Success);
}
+#endif
else
return (!Success);
}
commit db7b7d03a7e9136badf994c218cd137b59a376c2
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 19:05:02 2007 +0200
Added man/penmount.? to .gitignore.
diff --git a/.gitignore b/.gitignore
index d90176e..04b9542 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ ltmain.sh
missing
stamp-h1
*~
+man/penmount.?
commit 564d77fc97015fe5ae1dd7baf643524ad32ba19d
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 19:04:08 2007 +0200
Bumped version to 1.2.1.
diff --git a/configure.ac b/configure.ac
index 17a0a88..a207053 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-penmount],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-penmount)
commit 45808497336a336ed76450fbe8279f0e6a7d5a4d
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 19:03:30 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 0eea29e..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,54 +0,0 @@
-2006-06-03 Daniel Stone <daniel@freedesktop.org>
-
- * configure.ac:
- Bump to 1.2.0.
-
- * src/xf86PM.c:
- * src/xf86PM.h:
- Bug #4495: Add DMC9000 support (Jaya Kumar).
-
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/xf86PM.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 395e77e359d7d95e57116e70393ddba8d753efcc
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:21 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 4f886668127dad7f561334459cd9723f9af93103
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:36 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 960f0207a4845b489a1c1ca9823821047722585d
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 01:09:31 2007 +0300
Convert from TSCalibrationCtl to AbsCalibCtl
diff --git a/src/xf86PM.c b/src/xf86PM.c
index 70e855c..0a6d1ad 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -751,7 +751,7 @@ DMC9000_ReadInput (InputInfoPtr pInfo)
static int
ControlProc (InputInfoPtr pInfo, xDeviceCtl * control)
{
- xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control;
+ xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control;
PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private);
priv->min_x = c->min_x;
Reply to: