xserver-xorg-input-dmc: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 20 ++++++++++++++++++++
ChangeLog | 45 ---------------------------------------------
Makefile.am | 11 +++++++++++
configure.ac | 2 +-
man/.cvsignore | 2 --
man/.gitignore | 2 ++
src/.cvsignore | 6 ------
src/.gitignore | 6 ++++++
src/xf86DMC.c | 8 ++++++--
10 files changed, 46 insertions(+), 75 deletions(-)
New commits:
commit a588412e30c6e1d23817c8a559e4e3b583f980e2
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 15:17:39 2008 -0400
dmc 1.1.2
diff --git a/configure.ac b/configure.ac
index 2b16013..6b2bc1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-dmc],
- 1.1.1,
+ 1.1.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-dmc)
commit c4e0ea36b83e72a4c49e5dbaa861e9e70cce0127
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 30 16:53:08 2008 -0200
Don't call xf86XInputSetSendCoreEvents
Only call that function if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.
diff --git a/src/xf86DMC.c b/src/xf86DMC.c
index 352ff30..e6797d8 100644
--- a/src/xf86DMC.c
+++ b/src/xf86DMC.c
@@ -122,7 +122,9 @@ static const char *reqSymbols[] = {
"xf86SetIntOption",
"xf86SetStrOption",
"xf86XInputSetScreen",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
"xf86XInputSetSendCoreEvents",
+#endif
NULL
};
@@ -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 (pInfo, (mode == SendCoreEvents));
return (Success);
}
+#endif
else
return (!Success);
}
commit 997ababb005efe7bd79c2e9445ed288d8402e2ed
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 7 03:08:43 2007 +0200
Bump to 1.1.1
diff --git a/configure.ac b/configure.ac
index 448391c..2b16013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-dmc],
- 1.1.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-dmc)
commit 939750c472f9c209a4bdb233df36ce649660ffa8
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 7 03:06:25 2007 +0200
remove ChangeLog, add dist hook
Remove ChangeLog from the tree, and add a git dist hook to generate
it automatically.
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 2a584d7..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/xf86DMC.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..3abadec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,14 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+
+EXTRA_DIST=ChangeLog autogen.sh
+
+CLEANFILES=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)
+
+dist-hook: ChangeLog
commit 5bf3ca5537470888614d21e0d8920d3030d4116c
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:04 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 b2688f5e93f558f6e6176bbf02e8641910ff9642
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:23 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 43a05fb4cb02f15fc91d0909a3cab37a9de6b622
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 00:57:59 2007 +0300
Move from TSCalibrationCtl to AbsCalibCtl
This change happened a while ago in inputproto.
diff --git a/src/xf86DMC.c b/src/xf86DMC.c
index e817e71..352ff30 100644
--- a/src/xf86DMC.c
+++ b/src/xf86DMC.c
@@ -526,7 +526,7 @@ ReadInput (InputInfoPtr pInfo)
static int
ControlProc (InputInfoPtr pInfo, xDeviceCtl * control)
{
- xDeviceTSCalibrationCtl *c = (xDeviceTSCalibrationCtl *) control;
+ xDeviceAbsCalibCtl *c = (xDeviceAbsCalibCtl *) control;
DMCPrivatePtr priv = (DMCPrivatePtr) (pInfo->private);
priv->min_x = c->min_x;
commit 8b32deeefab848e91db970a51d2021a5382107df
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Aug 6 22:25:20 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
diff --git a/src/xf86DMC.c b/src/xf86DMC.c
index 62221dc..e817e71 100644
--- a/src/xf86DMC.c
+++ b/src/xf86DMC.c
@@ -74,7 +74,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: