xorg-server: Changes to 'debian-unstable'

[David Nusinow <dnusinow@alioth.debian.org>]

 debian/changelog                    |    7 ++++++-
 debian/xserver-xorg-core.bug.script |   10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 6f9b448f54d0eed4423d7a155898f333a66daac8
Author: David Nusinow <dnusinow@debian.org>
Date:   Thu Apr 16 22:44:59 2009 -0400

    Have the reportbug script append lshal and drm info.
    The drm info comes from grepping dmesg output.

diff --git a/debian/changelog b/debian/changelog
index b3f23bb..543104e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 xorg-server (2:1.6.1-2) UNRELEASED; urgency=low
 
+  [ Brice Goglin ]
   * Add 20_hurd-i386.diff to fix FTBFS on hurd-i386,
     thanks Samuel Thibault! (closes: #523970)
 
- -- Brice Goglin <bgoglin@debian.org>  Wed, 15 Apr 2009 15:32:04 +0200
+  [ David Nusinow ]
+  * Have the reportbug script append lshal and drm info.
+    The drm info comes from grepping dmesg output.
+
+ -- David Nusinow <dnusinow@debian.org>  Thu, 16 Apr 2009 22:44:29 -0400
 
 xorg-server (2:1.6.1-1) unstable; urgency=low
 
diff --git a/debian/xserver-xorg-core.bug.script b/debian/xserver-xorg-core.bug.script
index 739cdd3..11f83be 100644
--- a/debian/xserver-xorg-core.bug.script
+++ b/debian/xserver-xorg-core.bug.script
@@ -117,6 +117,16 @@ else
     printf "No Xorg X server log files found.\n"
 fi
 
+if [ -x /usr/bin/lshal ]; then
+    printf "HAL Information (lshal):\n"
+    lshal
+fi
+
+if [ -x /bin/dmesg ]; then
+    printf "DRM Information from dmesg:\n"
+    dmesg | grep 'drm'
+fi
+
 printf "\n"
 
 # vim:set ai et sts=4 sw=4 tw=0: