xserver-xorg-input-magellan: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 21 +++++++++++++++++++++
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/magellan.c | 3 +--
src/magellan.h | 2 +-
12 files changed, 40 insertions(+), 77 deletions(-)
New commits:
commit 90955ce39a01d9dd649b62952ed3fa2f1e63af66
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 16:11:43 2008 -0400
magellan 1.2.0
diff --git a/configure.ac b/configure.ac
index 217c06a..4b3acd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-magellan],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-magellan)
commit 08e727a32ffe0cb4543a5f297b62cce249e12cdd
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 16:10:31 2008 -0400
s/xf86usleep/usleep/
diff --git a/src/magellan.h b/src/magellan.h
index 88ac77e..5a81f83 100644
--- a/src/magellan.h
+++ b/src/magellan.h
@@ -68,7 +68,7 @@ MAGELLANState;
#define MagellanNibble(Value) (Value&0x0F)
-#define milisleep(ms) xf86usleep (ms * 1000)
+#define milisleep(ms) usleep (ms * 1000)
typedef struct _MagellanPrivateRec
{
commit c2fd043bb86066a4002c585c41f4dd9b8936e3f7
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:06:23 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index 58c5a8e..4f8b490 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit bcee9eea6f6dfd53c604c2caa45048fb9fe2dc1e
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:48:01 2007 +0200
Bumped version to 1.1.1.
diff --git a/configure.ac b/configure.ac
index b1d7236..217c06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-magellan],
- 1.1.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-magellan)
commit 36b02c9b69b6ae2fc126936a03293f937256bbf9
Author: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Mon Sep 10 18:47:21 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 a04e9eb..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/magellan.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 854e74a9010202eb1a435fae80019c02041468d5
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:12 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 1fb884c596d79972ff2b340d1061c94cde6c6769
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:29 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 0cb6f76c93e19371c681fb4a3c7f698c1b098d39
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Aug 8 01:08:08 2007 +0300
Remove useless debugging statement
diff --git a/src/magellan.c b/src/magellan.c
index 56669ad..b27d595 100644
--- a/src/magellan.c
+++ b/src/magellan.c
@@ -249,7 +249,6 @@ MagellanPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
}
priv->buffer = XisbNew (pInfo->fd, 200);
- DBG (9, XisbTrace (priv->buffer, 1));
/*
* Verify the hardware is attached and functional
commit bcd2a71ee0e861614cc7db18cd6b2cfc0b5bc6b5
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 09:15:49 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
diff --git a/src/magellan.c b/src/magellan.c
index 926f47d..56669ad 100644
--- a/src/magellan.c
+++ b/src/magellan.c
@@ -84,7 +84,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: