xorg-server: Changes to 'debian-experimental'

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

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

New commits:
commit 9178ad1dc0d1923f7131e01f33dba2e03f5ebed7
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Dec 7 15:29:09 2009 +0100

    Update xserver-xorg-core bug script to run udevadm info instead of lshal.

diff --git a/debian/changelog b/debian/changelog
index 2c1b856..2bfe403 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-server (2:1.7.3-1) UNRELEASED; urgency=low
   * xserver-xorg-dev: add Depends on x11proto-kb-dev and libxkbfile-dev for
     xkbsrv.h (closes: #559676).  Thanks, Ron!
   * Update input_id to the version in udev 149.
+  * Update xserver-xorg-core bug script to run udevadm info instead of lshal.
 
   [ Timo Aaltonen ]
   * New upstream release.
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index e994d43..5a50561 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -117,15 +117,11 @@ else
     printf "No Xorg X server log files found.\n"
 fi
 
-if [ -x /usr/bin/lshal ]; then
-    printf "\nHAL Information (lshal):\n"
-    for udi in `(hal-find-by-capability --capability input.keys;
-                 hal-find-by-capability --capability input.mouse;
-                 hal-find-by-capability --capability input.touchpad;
-                 hal-find-by-capability --capability input.tablet
-                )|sort -u`;
+if [ -x /sbin/udevadm ]; then
+    printf "\nudev information:\n"
+    for dev in /dev/input/event*;
     do
-        lshal -u "$udi"
+        /sbin/udevadm info --query=all --name=$dev
     done
 fi