xorg-server: Changes to 'debian-unstable'

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

 debian/changelog                    |    2 ++
 debian/xserver-xorg-core.bug.script |    5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 220b0f6b2362d10c4d9d077a9521446585758f5d
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun May 9 18:19:05 2010 +0200

    Try to catch non-event devices when running udevadm info in the bug script.

diff --git a/debian/changelog b/debian/changelog
index 0d51ed1..3cabb9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xorg-server (2:1.7.7-2) UNRELEASED; urgency=low
 
   * autoconfig: load the nouveau driver for nvidia hw.  Stolen from F13.
+  * Try to catch non-event devices when running udevadm info in the bug
+    script.
 
  -- Julien Cristau <jcristau@debian.org>  Fri, 07 May 2010 17:03:15 +0200
 
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index bcc11cf..a24bd0f 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -136,10 +136,7 @@ fi
 
 if [ -x /sbin/udevadm ]; then
     printf "\nudev information:\n"
-    for dev in /dev/input/event*;
-    do
-        /sbin/udevadm info --query=all --name=$dev
-    done
+    /sbin/udevadm info --export-db | awk -F '\n' -v RS='\n\n' '/E: ID_INPUT/ { print; print "" }'
 fi
 
 if [ -x /bin/dmesg ]; then