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

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

 configure.ac |    2 +-
 src/evdev.c  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ef607b6cce8e1feb6632c6bc1e7f322095ce54d9
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Aug 4 09:16:53 2008 +0930

    Actually close the fd on DEVICE_CLOSE (bug#16948)
    
    Fixes file descriptor leak.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
    (cherry picked from commit d9097df01b01afaf946fa04fca8ae8ab7108ff21)

diff --git a/src/evdev.c b/src/evdev.c
index 45b0e5d..164346a 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -864,6 +864,7 @@ EvdevProc(DeviceIntPtr device, int what)
 
     case DEVICE_CLOSE:
 	xf86Msg(X_INFO, "%s: Close\n", pInfo->name);
+	close(pInfo->fd);
 	break;
     }
 

commit 906a5d6add75d3bf3077d0542352534256b734d4
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Jul 30 10:40:47 2008 +0200

    Print the device name when we get a read error
    (cherry picked from commit 5c074af5a9abba138023e3bc6954d1062f7c36dd)

diff --git a/src/evdev.c b/src/evdev.c
index 0cd016a..45b0e5d 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -162,7 +162,7 @@ EvdevReadInput(InputInfoPtr pInfo)
         if (len != sizeof ev) {
             /* The kernel promises that we always only read a complete
              * event, so len != sizeof ev is an error. */
-            xf86Msg(X_ERROR, "Read error: %s\n", strerror(errno));
+            xf86Msg(X_ERROR, "%s: Read error: %s\n", pInfo->name, strerror(errno));
             break;
         }
 

commit 5152d616cab6912a45e09c37c0330064d2f412f2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Aug 1 17:29:24 2008 +0930

    evdev 2.0.3

diff --git a/configure.ac b/configure.ac
index c9a58c8..251c431 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-input-evdev],
-        2.0.2,
+        2.0.3,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-input-evdev)