[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xserver-xorg-input-evdev: Changes to 'debian-unstable'



 ChangeLog              |  381 ++++++++++++++++
 Makefile.in            |  131 +++--
 aclocal.m4             |  676 +++++++++++++++++++----------
 config.guess           |   34 +
 config.sub             |   24 -
 configure              | 1139 ++++++++++++++++++++++++++++++-------------------
 configure.ac           |    2 
 debian/changelog       |   25 +
 debian/control         |    6 
 debian/copyright       |   52 +-
 debian/rules           |    2 
 depcomp                |   64 ++
 install-sh             |  348 +++++++++++---
 ltmain.sh              |  233 ++++++----
 man/Makefile.in        |   92 ++-
 man/evdev.man          |   32 -
 missing                |   61 +-
 mkinstalldirs          |    5 
 src/Makefile.am        |    2 
 src/Makefile.in        |  153 +++---
 src/evdev.c            |  458 +++++++++++--------
 src/evdev.h            |  241 ++++------
 src/evdev_axes.c       |  810 ++++++++++++++++++++++------------
 src/evdev_brain.c      |  505 ---------------------
 src/evdev_btn.c        |  326 +++++++++-----
 src/evdev_key.c        |  225 ++++++---
 src/inotify-syscalls.h |   83 ---
 src/inotify.h          |   60 --
 28 files changed, 3643 insertions(+), 2527 deletions(-)

New commits:
commit a30fdd0da5627423ee8e4ebabcb08cae326a67ff
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Sep 16 15:32:19 2007 -0400

    * Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 864030b..1c09308 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:1.2.0~git20070819-3) unstable; urgency=low
+
+  * Upload to unstable
+
+ -- David Nusinow <dnusinow@debian.org>  Sun, 16 Sep 2007 15:13:36 -0400
+
 xserver-xorg-input-evdev (1:1.2.0~git20070819-2) experimental; urgency=low
 
   * Build against xserver 1.4.
diff --git a/man/evdev.man b/man/evdev.man
index 2395cd8..6cd86a5 100644
--- a/man/evdev.man
+++ b/man/evdev.man
@@ -317,6 +317,6 @@ enhance the keyboard behaviour.  Default: not set.
 .SH AUTHORS
 Zephaniah E. Hull.
 .fi
-Kristian Høgsberg.
+Kristian H\(/ogsberg.
 .SH "SEE ALSO"
 __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).

commit f401e824fa140ff0959c553d58dc5911fc7b3584
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Sep 10 16:30:59 2007 +0200

    Build against xserver 1.4.

diff --git a/debian/changelog b/debian/changelog
index db89f9c..864030b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-evdev (1:1.2.0~git20070819-2) experimental; urgency=low
+
+  * Build against xserver 1.4.
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 10 Sep 2007 16:30:28 +0200
+
 xserver-xorg-input-evdev (1:1.2.0~git20070819-1) experimental; urgency=low
 
   * New git snapshot from upstream's master branch.
diff --git a/debian/control b/debian/control
index b71a44b..f29c283 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
 XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git

commit a1a094ac886d1ce45803704a149eb1b6d0800c82
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Aug 19 17:22:44 2007 +0200

    Prepare changelog for upload.

diff --git a/debian/changelog b/debian/changelog
index 0669380..db89f9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-xserver-xorg-input-evdev (1:1.2.0~git20070819-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:1.2.0~git20070819-1) experimental; urgency=low
 
   * New git snapshot from upstream's master branch.
     + manpage typos fixed (closes: #432063).  Thanks, A. Costa!
+  * Build against xserver 1.3.99.0.
   * Update debian/copyright.
   * Generate the Provides field automatically.
   * Add myself to uploaders, and remove Branden with his permission.
   * Drop build-dep on linux-kernel-headers, which is provided by
     build-essential.
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 17:20:29 +0200
+ -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 17:22:09 +0200
 
 xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low
 

commit d020d9ec950b618f39d0a13115c9411c5dd9eee4
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Aug 19 17:21:53 2007 +0200

    Drop build-dep on linux-kernel-headers.
    
    This functionality is provided by build-essential (via linux-libc-dev).

diff --git a/debian/changelog b/debian/changelog
index 66efabf..0669380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ xserver-xorg-input-evdev (1:1.2.0~git20070819-1) UNRELEASED; urgency=low
   * Update debian/copyright.
   * Generate the Provides field automatically.
   * Add myself to uploaders, and remove Branden with his permission.
+  * Drop build-dep on linux-kernel-headers, which is provided by
+    build-essential.
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 17:19:50 +0200
+ -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 17:20:29 +0200
 
 xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e8feab0..b71a44b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.3.99.0), linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.3.99.0), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
 XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git

commit 0e21ab82155a85dd5113ea1576368d0cda7a29d1
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Aug 19 17:20:12 2007 +0200

    Add myself to uploaders, and remove Branden with his permission

diff --git a/debian/changelog b/debian/changelog
index 45ab2f4..66efabf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xserver-xorg-input-evdev (1:1.2.0~git20070819-1) UNRELEASED; urgency=low
     + manpage typos fixed (closes: #432063).  Thanks, A. Costa!
   * Update debian/copyright.
   * Generate the Provides field automatically.
+  * Add myself to uploaders, and remove Branden with his permission.
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 17:15:25 +0200
+ -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 17:19:50 +0200
 
 xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 99a914e..e8feab0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xserver-xorg-input-evdev
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
 Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.3.99.0), linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev

commit 56c0d2c632dfcfec27d39d2fd1e297a9b64370c5
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Aug 19 17:15:54 2007 +0200

    Bump build-dep on xserver-xorg-dev and generate the Provides field automatically.

diff --git a/debian/changelog b/debian/changelog
index e3cb169..45ab2f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xserver-xorg-input-evdev (1:1.2.0~git20070819-1) UNRELEASED; urgency=low
   * New git snapshot from upstream's master branch.
     + manpage typos fixed (closes: #432063).  Thanks, A. Costa!
   * Update debian/copyright.
+  * Generate the Provides field automatically.
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 15:59:21 +0200
+ -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 17:15:25 +0200
 
 xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6179b89..99a914e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Drew Parsons <dparsons@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.2.99.902), linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.3.99.0), linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev
 Standards-Version: 3.7.2
 XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
 XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git
@@ -11,7 +11,7 @@ XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evde
 Package: xserver-xorg-input-evdev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${xserver:Depends}
-Provides: xserver-xorg-input
+Provides: ${xinpdriver:Provides}
 Replaces: xserver-xorg (<< 6.8.2-35)
 Description: X.Org X server -- evdev input driver
  This package provides the driver for input devices using evdev, the Linux

commit da363389c2d77527bf8e1b33d4a65759bf9b72f8
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Aug 19 17:10:54 2007 +0200

    chmod +x configure in debian/rules clean.

diff --git a/debian/rules b/debian/rules
index bbf772d..cc59770 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,8 @@ clean: xsfclean
 	rm -f conftest* */conftest*
 	rm -rf autom4te.cache */autom4te.cache
 	rm -rf obj-*
+	# for snapshot builds
+	chmod +x configure
 
 	dh_clean
 

commit 04e5014f2ce9f67dff082d0092b2eae397480fb0
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Aug 19 15:59:44 2007 +0200

    Update debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index f37f07a..e3cb169 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-input-evdev (1:1.2.0~git20070819-1) UNRELEASED; urgency=low
 
   * New git snapshot from upstream's master branch.
     + manpage typos fixed (closes: #432063).  Thanks, A. Costa!
+  * Update debian/copyright.
 
- -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 15:43:50 +0200
+ -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 15:59:21 +0200
 
 xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 19dbd8b..bf3af89 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,36 @@
-Copyright © 2004 Red Hat, Inc.
+This package was downloaded from
+git://anongit.freedesktop.org/git/xorg/driver/xf86-input-evdev.
+Release tarballs are available at
+http://xorg.freedesktop.org/releases/individual/driver/
 
-Permission to use, copy, modify, distribute, and sell this software
-and its documentation for any purpose is hereby granted without
-fee, provided that the above copyright notice appear in all copies
-and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of Red Hat
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.  Red
-Hat makes no representations about the suitability of this software
-for any purpose.  It is provided "as is" without express or implied
-warranty.
+ Copyright © 2006-2007 Zephaniah E. Hull
+ Copyright © 2004 Red Hat, Inc.
 
-RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
-NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Soft-
+ ware"), to deal in the Software without restriction, including without
+ limitation the rights to use, copy, modify, merge, publish, distribute,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, provided that the above copyright
+ notice(s) and this permission notice appear in all copies of the Soft-
+ ware and that both the above copyright notice(s) and this permission
+ notice appear in supporting documentation.
 
-Author:  Kristian Høgsberg (krh@redhat.com)
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+ THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+ QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+ MANCE OF THIS SOFTWARE.
+
+ Except as contained in this notice, the name of a copyright holder shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization of
+ the copyright holder.
+
+ Authors:
+   Zephaniah E. Hull (warp@aehallh.com),
+   Kristian Høgsberg (krh@redhat.com)

commit 4595738480b0b5df075a8403a9d69744e8cb6afe
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Aug 19 15:53:57 2007 +0200

    Update changelogs for new upstream snapshot.

diff --git a/ChangeLog b/ChangeLog
index 17b0283..4ded79c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,384 @@
+commit e2be2ffa473583b98b93a319163bb54eb5d83ed6
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Aug 1 00:02:33 2007 +0300
+
+    Options: Accept differently-named options
+    
+    Take some differently-named options for device and the XKB options.  These
+    should really be better-handled, but eh.
+
+commit e86aab93c56ad72f3798169ea94dc6b91dab6ab6
+Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
+Date:   Thu Jul 26 18:31:58 2007 +0200
+
+    Multiple typos in evdev.man
+    
+    Reported by "A. Costa" <agcosta@gis.net> in
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432063
+
+commit c69f4bd5707093a4f998c3fad508f466edbe8334
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Fri Jun 15 01:35:29 2007 -0300
+
+    Clean up a little bit the code.
+
+commit 64677ecc76d6eae530960b714712921e1bb9d4a7
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Fri Jun 15 01:33:49 2007 -0300
+
+    Remove inotify things.
+
+commit 08a09682f5b6d43181e98bc72782e2b2eec180e5
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Wed Jun 13 11:05:07 2007 -0400
+
+    Update version using PACKAGE_VERSION_*.
+
+commit 9c9a47210a6c7146f29fd6d05b6f46955a3bee5a
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Jun 12 11:59:16 2007 -0400
+
+    Move the mode option handling to the Init stage.
+    (Sorta ugly placement wise, but the other segfaults.)
+
+commit 2d2c4804f925505e737c2c812687f47840218c93
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Mon Jun 11 09:08:24 2007 -0400
+
+    evdev.c:
+    
+        Set and use the X mode control, letting XInput see it properly.
+    
+        Kill some cruft.
+    
+    evdev.h:
+    
+        Set and use the X mode control, letting XInput see it properly.
+    
+    evdev_axes.c:
+    
+        Set and use the X mode control, letting XInput see it properly.
+    
+    evdev_key.c:
+    
+        Remove some cruft, the bell func can be NULL now, so do so.
+    
+        Don't bother looking for keys above 0xF7 until we can actually do
+        something with them.
+
+commit 6b97bf7a4eaa34ebde4ac7250f660da5bab8164d
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Wed Jun 6 05:00:29 2007 -0400
+
+    Handle default remapping around existing button targets better.
+
+commit 5c6b3dd86feef58ccf43a710624404031df72f2c
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Wed Jun 6 04:42:51 2007 -0400
+
+    Move MapButtons_t closer to where it's used.
+
+commit f15636ac529481a9d83e0250ff89690296f96a3d
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Wed Jun 6 04:41:54 2007 -0400
+
+    Wheel mice work again!
+    (Old configs don't.)
+    
+    evdev.c:
+    
+        Add EvdevParseMapToButton and EvdevParseMapToButtons to evdev_map_parsers.
+    
+        Add EvdevParseMapOption to search through evdev_map_parsers.
+    
+        Fix up EvdevTokenize to handle the evdev_option_token_t changes.
+    
+        EvdevAxesNew0 after BtnNew0 instead of before now.
+        (This isn't the right fix.)
+    
+    evdev.h:
+    
+        EVDEV_MAXBUTTONS -> BTN_MAX.
+    
+        Redid evdevBtnRec with the new mapping goodness.
+    
+        Removed v_min and v_max from evdevAbsRec.
+    
+        Reworked evdev_option_token_t, no union, no is_chain.
+        If it's a chain, it still has a string, but the chain pointer is set.
+    
+        EvdevParseMapToButton, EvdevParseMapToButtons, and EvdevParseMapOption.
+    
+    evdev_axes.c:
+    
+        Kill off EvdevAxesMapButton, a variant lives in evdev_btn.c now.
+    
+        Changes for the evdev_option_token_t changes.
+    
+        Use EvdevParseMapOption instead of repeating the contents twice.
+    
+        Disable EV_ABS_V_INVERT for the moment. (Better fix maybe needed.)
+    
+    evdev_btn.c:
+    
+        s/Ptr /Rec */g
+    
+        EvdevMapButton and parser.
+    
+        EvdevMapButtons and parser.
+    
+        Nuke EvdevBtnCalcRemap as a whole.
+    
+        Move everything but the alloc to New1 from New0.
+    
+        New mapping code, same guts os the axes mapping code even.
+
+commit 276685fa1dfc7c2d78178173545df3e28bc82544
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Jun 5 23:55:50 2007 -0400
+
+    Fix REL mode.
+    
+    Make buttons mostly work again. (Short term fix.)
+    
+    NOTE: Wheel to button remapping is still missing!
+
+commit 27a86f81683794c1f7cd3bc6d474898ff69a7b6e
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Jun 5 23:19:59 2007 -0400
+
+    Update the copyright notices for me to include 2007.
+    
+    Finish merging copyright notices. (evdev_key.c was missed.)
+
+commit 26dbf38041ebe67e7ab399a6746684a404ea2121
+Merge: 2943558... 9eb546e...
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Jun 5 23:14:46 2007 -0400
+
+    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev
+    
+    Conflicts:
+    
+    	src/evdev.h
+
+commit 294355842ba9fb3cb3bbd7bfd60c9ca3ce704475
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Jun 5 23:12:58 2007 -0400
+
+    Alright, this is a really big commit that breaks stuff.
+    
+    evdev.h:
+    
+        Switch to flags in the abs and rel structs.
+    
+        Add the axes struct, and defines.
+    
+        Rework the abs and rel structs, moving stuff to the axes struct and moving
+        everything to the new mapping handling.
+    
+        Add the structs and function declarations for the new tokenization stuff,
+        parsing stuff, and mapping stuff.
+    
+    evdev.c: Add EvdevTokenize, and the evdev_map_parsers list.
+    
+    evdev_axes.c:
+    
+        Basicly a full rewrite, big, messy.
+    
+        We now use a completely different mapping setup for axes, and mapping to
+        buttons is currently missing.
+    
+        However we now handle ABS_CALIB and ABS_AREA, including rotation in both
+        rel and abs modes.
+    
+    evdev_btn.c:
+    
+        Disable lots of code and break things horribly, we compile but we don't
+        work very well.
+    
+        Fixing this is next on my todo list.
+
+commit 9eb546e0e00be30ac6e767b196b17651df2e3d96
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Tue Jun 5 18:26:07 2007 -0400
+
+    Fix header file #ifdef guard.
+
+commit daf926081d1524a8d4980578d5254c42c2791462
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Tue Jun 5 18:24:33 2007 -0400
+
+    Merge copyright notices.
+
+commit c22c955c482df9a7645662023b6d1cf0f33aff15
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Tue Apr 24 23:20:43 2007 +0930
+
+    Disable and remove the device when a read error occurs.
+
+commit f87c44b90cb48a846160b16ff910545f5a659d15
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Apr 24 07:44:26 2007 -0400
+
+    Try harder to make unplugging work.
+
+commit 23309b334c1fe892f7afa735d04569e210497dc3
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Apr 24 07:34:53 2007 -0400
+
+    Kill some more unused bits.
+
+commit 1716ec88bbc980507aa7afeb133b552f77a91a01
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Apr 24 07:34:25 2007 -0400
+
+    Handle driver removal cleanly, we now xfree everything we Xcalloc.
+    
+    NOTE: Someone needs to check for memory leaks, I'd be willing to bet
+    a fair bit that we've got tons in the mouse and xkb code, but.
+
+commit 246812bfbcd856ac0dea237cdbe252706fe17688
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Apr 24 07:01:54 2007 -0400
+
+    Remove the evil xf86ActivateDevice declaration, don't need it anymore.
+    
+    Fix the crash on device unplug.
+    
+    NOTE: We still don't properly get rid of ourselves.
+
+commit a0ea7363f51ff6c2bb81006b7220b7daa9ee9221
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Apr 24 06:49:11 2007 -0400
+
+    Remove all of evdev_brain.c and all callers.
+    
+    Remove the non-functional 2.4 kernel compiling compatibility.
+    
+    Remove the XInput 1.4+ SendCoreEvents/DontSendCoreEvents define replacements.
+    
+    Remove evdevDriver, some stuff from evdevDevice, all users.
+    
+    NOTE: This WILL BREAK all existing configurations.
+    
+    NOTE: Device read failure segfaults, don't unplug stuff.
+
+commit 3c4a96fbd851e46830fe82570d04e191bae5e8e3
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date:   Tue Apr 24 06:12:14 2007 -0400
+
+    Updated configure to 1.2.0, no changes yet.
+    
+    This branch is the great xserver input-hotplug rewrite, consider it unstable
+    but usable with the 'current' (as of this commit) git xserver.
+    
+    (Once it's more done that is.)
+    
+    NOTE: This branch will _not_ remain source or binary compatable with
+    pre-input-hotplug xservers, you have been warned.
+
+commit ba65c34068a836ae393565a6a8260a4e96709816
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Mon Apr 23 10:08:48 2007 +0930
+
+    Remove driver from list if no device is associated any more.
+    
+    This effectively stops the driver from hotplugging new devices. Devices have
+    to be added with the dbus hotplugging events.
+
+commit 9644a4afbfd8ac4cb51facf0409f73f55743d8a3
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 19 15:40:25 2007 +0930
+
+    Remove direct call to DEVICE_INIT, ActivateDevice() takes care of that.
+
+commit d37ba205bba0be782e3cd02ca7cedb98a304482d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 19 15:38:26 2007 +0930
+
+    Add some documentation to evdev.c and evdev_brain.c.
+
+commit 9875e2f7f96c6bfc4f01fffc7e1127724bbd0b7d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Thu Apr 19 11:28:13 2007 +0930
+
+    ActivateDevice() before EnableDevice() in EvdevNew.
+
+commit 6db4a9fb84f828f745202c3fddc58d389fca220b
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date:   Sun Mar 25 15:40:26 2007 +0930
+
+    Key: Remove duplicate of keycode 0x6f, remove index 0xf8 to get a
+    maxKeyCode of 255. This way keycode range is in sync with core keyboard range.
+
+commit a9e87f29ccdadebb0742317bb57d66eaaca4b593
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Mar 21 12:19:48 2007 +0200
+
+    Key: Force maximum keycode to be 255
+    Even though we don't have keycodes for anything above 127, make sure our
+    map always covers up to 255.  This ensures that the keycode range never
+    changes.
+
+commit b4a5a20476f7bc77d54a860d7cdd81c223bdb81f
+Author: Tiago Vignatti <vignatti@c3sl.ufpr.br>
+Date:   Wed Feb 14 19:23:21 2007 -0200
+
+    Fix pointer crossing screen bug. Possibly the others input drivers must update
+    this on the same manner.
+
+commit 24f9e67a8f9729fa7cb10f0479a3be9c16c5d13a
+Author: Philip Langdale <philipl@fido2.homeip.net>
+Date:   Sat Feb 10 22:17:01 2007 -0800
+
+    Stop caching the screen size for scaling.
+    
+    Do be able to correctly scale absolute inputs, the actual
+    screen size must be used as this changes when the screen
+    resizes.
+
+commit d8d8f114caece4c26c777ae6eee57e66b1f499e7
+Author: root <root@agamemnon.b5>
+Date:   Wed Jan 17 19:27:40 2007 -0500
+
+    For reasons related to handling pathological remapping cases, and
+    differences between HID and X, pretend a middle button exists
+    whenever a right button exists.
+
+commit ebb30a554fe084a50c7281defea80c38bc1b0ddd
+Author: root <root@agamemnon.b5>
+Date:   Sat Jan 13 07:33:49 2007 -0500
+
+    Fix a bug where we potentially wrote garbage events when LEDs change.
+    
+    Support setting keyboard repeat rate/period.
+
+commit 3d8bb262e42b1c5442aebb4048c71b4dc8ce24a0
+Author: root <root@agamemnon.b5>
+Date:   Thu Jan 11 22:42:19 2007 -0500
+
+    Handle swapping of right and middle buttons better in some odder cases.
+
+commit 987c6b1597f184e035c3ecef15a776f7c64cd4fe
+Author: root <root@agamemnon.b5>
+Date:   Thu Jan 11 22:41:23 2007 -0500
+
+    No more call to xf86OSRingBell in any cases,
+     maybe do some conditional stuff later.
+
+commit 8155e49e76aa2d1d953fb71ead6a5c3110f3d80c
+Author: root <root@agamemnon.b5>
+Date:   Mon Jan 8 08:59:44 2007 -0500
+
+    Pad out button_names so we can loop over things more sanely.
+    
+    Support for ignoring the existance of buttons,
+    and for not telling X about them.
+    
+    By default don't tell X about tools and touch as buttons.
+    TODO: Revisit this choice later.
+
 commit e1fe72e7fe663a479a5be1b5e16ecbba52f511a8
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Sat Dec 16 01:42:18 2006 +0200
diff --git a/debian/changelog b/debian/changelog
index a8c4c38..f37f07a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:1.2.0~git20070819-1) UNRELEASED; urgency=low
+
+  * New git snapshot from upstream's master branch.
+    + manpage typos fixed (closes: #432063).  Thanks, A. Costa!
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 19 Aug 2007 15:43:50 +0200
+
 xserver-xorg-input-evdev (1:1.1.5-3) unstable; urgency=low
 
   * Cherry-pick commit 987c6b15: don't call xf86OSRingBell() which isn't

commit 6d718fe13de27a1e9c93ab72d19823b6b852b0f4
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Aug 19 15:43:14 2007 +0200

    autoreconf

diff --git a/Makefile.in b/Makefile.in
index 7d16b85..5255897 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -33,15 +33,11 @@
 #  ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -55,17 +51,17 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+subdir = .
 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure COPYING ChangeLog compile config.guess \
 	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
@@ -73,10 +69,13 @@ SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -94,8 +93,6 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
 ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APP_MAN_DIR = @APP_MAN_DIR@
 APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
@@ -130,6 +127,7 @@ FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -143,11 +141,10 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -158,19 +155,20 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -182,6 +180,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -210,8 +209,11 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
 EXTRA_DIST = ChangeLog
@@ -257,7 +259,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -279,7 +281,6 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -312,8 +313,7 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
@@ -415,23 +415,22 @@ distclean-tags:
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -445,7 +444,7 @@ distdir: $(DISTFILES)
 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
 	    distdir=`$(am__cd) $(distdir) && pwd`; \
 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -453,6 +452,8 @@ distdir: $(DISTFILES)
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$top_distdir" \
 	        distdir="$$distdir/$$subdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -463,7 +464,7 @@ distdir: $(DISTFILES)
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -538,7 +539,7 @@ distcheck: dist



Reply to: