xf86-input-magellan 1.2.0

3 files changed, 238 insertions, 30 deletions

diff --git a/driver/xf86-input-magellan/ChangeLog b/driver/xf86-input-magellan/ChangeLog
index a04e9eb01..64abb08eb 100644
--- a/driver/xf86-input-magellan/ChangeLog
+++ b/driver/xf86-input-magellan/ChangeLog
@@ -1,45 +1,253 @@
-2006-04-06  Adam Jackson  <ajax@freedesktop.org>
+commit 08e727a32ffe0cb4543a5f297b62cce249e12cdd
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Thu Mar 20 16:10:31 2008 -0400
 
-	* configure.ac:
-	* src/magellan.c:
-	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
+    s/xf86usleep/usleep/
 
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit c2fd043bb86066a4002c585c41f4dd9b8936e3f7
+Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
+Date:   Sat Mar 8 23:06:23 2008 +0100
 
-	* configure.ac:
-	Update package version for X11R7 release.
+    Makefile.am: nuke RCS Id
 
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit bcee9eea6f6dfd53c604c2caa45048fb9fe2dc1e
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date:   Mon Sep 10 18:48:01 2007 +0200
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    Bumped version to 1.1.1.
 
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 36b02c9b69b6ae2fc126936a03293f937256bbf9
+Author: Tilman Sauerbeck <tilman@code-monkey.de>
+Date:   Mon Sep 10 18:47:21 2007 +0200
 
-	* man/Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+    Generate ChangeLog from git.
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 854e74a9010202eb1a435fae80019c02041468d5
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:52:12 2007 -0400
 
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    Add *~ to .gitignore to skip patch/emacs droppings
 
-2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 1fb884c596d79972ff2b340d1061c94cde6c6769
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Aug 23 19:25:29 2007 -0400
 
-	* configure.ac:
-	Remove extraneous AC_MSG_RESULT.
+    Rename .cvsignore to .gitignore
 
-2005-11-29  Adam Jackson  <ajax@freedesktop.org>
+commit 0cb6f76c93e19371c681fb4a3c7f698c1b098d39
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Aug 8 01:08:08 2007 +0300
 
-	* configure.ac:
-	Only build dlloader modules by default.
+    Remove useless debugging statement
 
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit bcd2a71ee0e861614cc7db18cd6b2cfc0b5bc6b5
+Author: Brice Goglin <bgoglin@debian.org>
+Date:   Tue Aug 7 09:15:49 2007 +0200
 
-	* configure.ac:
-	Update package version number for X11R7 RC2 release.
+    Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in VersionRec
 
-2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit c3c95d2ada507b01f067fb2558f820dd697eea61
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Fri Apr 7 17:49:43 2006 +0000
 
-	* configure.ac:
-	Update pkgcheck dependencies to work with separate build roots.
+    bcwrap. Bump server version requirement. Bump to 1.1.0.
+
+commit cf4c58c56000797f7e50c17de2b2e41232efdb61
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Dec 21 02:29:57 2005 +0000
+
+    Update package version for X11R7 release.
+
+commit 576bd77324a725b815b4cf4533435227e9f95882
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Dec 19 16:25:51 2005 +0000
+
+    Stub COPYING files
+
+commit b2bcc47596a01a3b1105d77bf3e0fbff28822145
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:15 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 3386debf879f50462c437a6df184e883e429f1ad
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Dec 6 22:48:30 2005 +0000
+
+    Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 88613dd1dac61a880b1a43ebf090f6d259c0b91c
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:31 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit 36668f804fbd134b86ba6a8ae8a419be681a1c47
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Dec 2 02:16:05 2005 +0000
+
+    Remove extraneous AC_MSG_RESULT.
+
+commit ef39ff9cb640e061f2c28240130792e26e09d655
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Tue Nov 29 23:29:56 2005 +0000
+
+    Only build dlloader modules by default.
+
+commit e44ef9c8a48689781b6bef79b9ce1cdbe0777eff
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 28 22:04:07 2005 +0000
+
+    Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+        update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit bf05a444f9ab0f4d353b8e3f0d8de862565a5556
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:49:05 2005 +0000
+
+    Add .cvsignores for drivers.
+
+commit b79e5ce704a56e9959ecff20cb15a6ccb69a0a27
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Nov 9 21:15:12 2005 +0000
+
+    Update package version number for X11R7 RC2 release.
+
+commit 6a30673621d61657e2880daa4c31a21b77e904d3
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Nov 1 15:08:50 2005 +0000
+
+    Update pkgcheck depedencies to work with separate build roots.
+
+commit a06ec440098f327c7c1d63833aebc5ccf0870d13
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:00 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 76e2714697f072c5b9bd028e737c15a7fa5f4230
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Oct 18 15:46:37 2005 +0000
+
+    Do the following to make the drivers pass distcheck:
+    - Only define EXTRA_DIST when there are actually man pages to be processed
+    - Add missing man pages to keyboard and ati drivers EXTRA_DIST
+
+commit bf6410bd872d18169d4e4dceaa8119bfbeca4cd7
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Tue Oct 18 00:01:51 2005 +0000
+
+    Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+        substitutions to work better with BSD make
+
+commit 8b44006376ec609428b969bda5e783a4ed911d03
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Oct 17 22:57:28 2005 +0000
+
+    More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+        of indirectly
+
+commit e34f6a2b686be59c5831cff78488a9d1235ace9d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Oct 17 00:08:58 2005 +0000
+
+    Use sed & cpp to substitute variables in driver man pages
+
+commit 7c4290c3192e8b69e7b72d33f1284a9402486e26
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Aug 18 09:03:39 2005 +0000
+
+    Update autogen.sh to one that does objdir != srcdir.
+
+commit 4184e19b0336d1a442d86abb6332a359c5f6cb8f
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Wed Aug 10 14:07:23 2005 +0000
+
+    Don\'t lose existing CFLAGS in all the input drivers and some of the video
+        drivers
+
+commit 5b7ddbb0619dc35c3dd759ca2d5dcc32e4659363
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:41 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit e9bd08c50720bae7f3314701181516bb7353774d
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Jul 13 20:03:22 2005 +0000
+
+    Make the module dir configurable
+
+commit 16f90eb43864138446d5748e59cea36db500af98
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Jul 13 02:21:00 2005 +0000
+
+    Update all input drivers to pass distcheck
+
+commit 03ca0405c6c4e9c8fbe0d4057d24e5378c2b163c
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Tue Jul 12 06:15:09 2005 +0000
+
+    Build skeletons for input drivers. Should basically work.
+
+commit 4ff4c13342fb496ac5ca51bc0814fd27d2df1961
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Mon Jul 11 02:38:00 2005 +0000
+
+    Prep input drivers for modularizing by adding guarded #include "config.h"
+
+commit 0a9608b4e3be39f60630dc84b712f6bc5e67b592
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Sat Jun 25 21:17:02 2005 +0000
+
+    Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit c5c5a625b10ecebde38d73fabdebfb40b02b6c50
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 19:54:03 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit 1034ff3c2b725bf1fdee087171616560558b7dee
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:33:52 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit d17622daa7d2905dd417df6cdbdf8db55af50e35
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:12:33 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 881cc800bfd1e3fbb5680c9f03b295b95e8656c4
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:36:00 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 09cc6101badb509de39d0dd5e530902fd2241260
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:23:34 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit fd5f31531c0205a718cb7565b639aafe1116070b
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:56 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 0010c7d5bf893f18f6bae52b58229a5ae1557a9b
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:56 2003 +0000
+
+    Initial revision
diff --git a/driver/xf86-input-magellan/configure.ac b/driver/xf86-input-magellan/configure.ac
index b1d7236ed..4b3acd49b 100644
--- a/driver/xf86-input-magellan/configure.ac
+++ b/driver/xf86-input-magellan/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-magellan],
-        1.1.0,
+        1.2.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-input-magellan)
 
diff --git a/driver/xf86-input-magellan/src/magellan.h b/driver/xf86-input-magellan/src/magellan.h
index 88ac77efd..5a81f838c 100644
--- a/driver/xf86-input-magellan/src/magellan.h
+++ b/driver/xf86-input-magellan/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
 {