xserver-xorg-input-magellan: Changes to 'upstream-experimental'

[Julien Cristau <jcristau@alioth.debian.org>]

 configure.ac    |    2 +-
 man/Makefile.am |    1 -
 src/magellan.h  |    2 +-
 3 files changed, 2 insertions(+), 3 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.
 #