xserver-xorg-input-calcomp: Changes to 'upstream-unstable'
.gitignore | 4 ++++
ChangeLog | 45 ---------------------------------------------
Makefile.am | 8 ++++++++
configure.ac | 2 +-
src/xf86Calcomp.c | 4 +---
5 files changed, 14 insertions(+), 49 deletions(-)
New commits:
commit b202b45aeec28c5f858c0df977d1dc8e1a9d14eb
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:15:04 2007 +0200
Added some more patterns to .gitignore.
diff --git a/.gitignore b/.gitignore
index d90176e..ea7f2db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ ltmain.sh
missing
stamp-h1
*~
+.deps
+.libs
+man/calcomp.?
commit 60bb7cdf42b0ac2fc9b9e1340423af7518fe1abe
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:13:36 2007 +0200
Bumped version to 1.1.1.
diff --git a/configure.ac b/configure.ac
index c2696dd..6d49e37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-calcomp],
- 1.1.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-calcomp)
commit 045dd911511bf806b8576302f1e196d137fb4665
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:12:33 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 b22e61d..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/xf86Calcomp.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 1f3bd7beab75627cb3005faf9c0347eb7d7e5903
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 00:52:35 2007 +0300
Compile fix when building with DEBUG
XisbTrace didn't seem to do anything useful at all.
diff --git a/src/xf86Calcomp.c b/src/xf86Calcomp.c
index 9beebe9..f834eea 100644
--- a/src/xf86Calcomp.c
+++ b/src/xf86Calcomp.c
@@ -686,8 +686,6 @@ CalcompPreInit( InputDriverPtr drv,
priv->checksum = 0;
priv->buffer = XisbNew (local->fd, 200);
- DBG (9, XisbTrace (priv->buffer, 1));
-
/*
* Verify that your hardware is attached and fuctional if you can
*/
commit c805910dda5b6aa7de2ded1e67b125ed2590fda5
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Aug 6 22:16:52 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
diff --git a/src/xf86Calcomp.c b/src/xf86Calcomp.c
index 89ec00c..9beebe9 100644
--- a/src/xf86Calcomp.c
+++ b/src/xf86Calcomp.c
@@ -101,7 +101,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: