xorg: Changes to 'ubuntu'

[Bryce Harrington <bryce-guest@alioth.debian.org>]

 debian/apport/source_xorg.py |   12 +++++++++---
 debian/changelog             |    8 +++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 9165ba862825e32f066c07557b022dad73df2b0a
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Thu Aug 21 16:00:34 2008 -0700

    update changelog

diff --git a/debian/changelog b/debian/changelog
index 27452b8..b8d1880 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 xorg (1:7.4~1ubuntu2) UNRELEASED; urgency=low
 
-  * apport/source_xorg.py: Add Xorg.0.log.old, xkbcomp and setxkbmap for
-    keyboard bugs.
+  * apport/source_xorg.py:
+    - Add Xorg.0.log.old
+    - Add xkbcomp and setxkbmap for keyboard bugs.
+    - Add intel_reg_dumper for -intel bugs.
 
- -- Bryce Harrington <bryce@ubuntu.com>  Fri, 15 Aug 2008 15:32:10 -0700
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 21 Aug 2008 15:59:56 -0700
 
 xorg (1:7.4~1ubuntu1) intrepid; urgency=low
 

commit b8a876962c442a3cf70d2f8185c573041c254a1d
Author: Bryce Harrington <bryce@bryceharrington.org>
Date:   Thu Aug 21 15:59:29 2008 -0700

    Fixing command line arguments and adding intel_reg_dumper

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 9db8908..30431f3 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -49,7 +49,7 @@ def add_info(report):
         pass
 
     try:
-        script = subprocess.Popen(['xrandr --verbose'], stdout=subprocess.PIPE)
+        script = subprocess.Popen(['xrandr', '--verbose'], stdout=subprocess.PIPE)
         report['Xrandr'] = script.communicate()[0]
     except OSError:
         pass
@@ -61,15 +61,21 @@ def add_info(report):
         pass
 
     try:
-        script = subprocess.Popen(['setxkbmap -print'], stdout=subprocess.PIPE)
+        script = subprocess.Popen(['setxkbmap', '-print'], stdout=subprocess.PIPE)
         report['setxkbmap'] = script.communicate()[0]
     except OSError:
         pass
 
     try:
-        script = subprocess.Popen(['xkbcomp :0 -'], stdout=subprocess.PIPE)
+        script = subprocess.Popen(['xkbcomp', ':0 -'], stdout=subprocess.PIPE)
         report['xkbcomp'] = script.communicate()[0]
     except OSError:
         pass
 
+    try:
+        script = subprocess.Popen(['intel_reg_dumper'], stdout=subprocess.PIPE)
+        report['intel_reg_dumper'] = script.communicate()[0]
+    except OSError:
+        pass
+