debian/apport/source_xorg.py |   17 +++++++++++++++++
 debian/changelog             |   11 +++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 20bb261f685cced3ba295a9f5f582142e5da166b
Author: Bryce Harrington <[EMAIL PROTECTED]>
Date:   Fri Aug 15 15:31:46 2008 -0700

    Keyboard debugging stuff

diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 8884913..9db8908 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -27,6 +27,11 @@ def add_info(report):
         pass
 
     try:
+        report['XorgLogOld']  = open('/var/log/Xorg.0.log.old').read()
+    except IOError:
+        pass
+
+    try:
         report['ProcVersion']  = open('/proc/version').read()
     except IOError:
         pass
@@ -55,4 +60,16 @@ def add_info(report):
     except OSError:
         pass
 
+    try:
+        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)
+        report['xkbcomp'] = script.communicate()[0]
+    except OSError:
+        pass
+
 
diff --git a/debian/changelog b/debian/changelog
index 2224bf8..6153859 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
+xorg (1:7.4~1ubuntu2) UNRELEASED; urgency=low
+
+  * apport/source_xorg.py: Add Xorg.0.log.old and setxkbmap for keyboard
+    bugs.
+
+ -- Bryce Harrington <[EMAIL PROTECTED]>  Fri, 15 Aug 2008 15:28:20 -0700
+
 xorg (1:7.4~1ubuntu1) intrepid; urgency=low
 
   [ Bryce Harrington ]
-  * apport/xserver-xorg-core.py:  Cleanup, add xdpyinfo, xrandr, fix
-    lspci args.
+  * apport/source_xorg.py:  Cleanup, add xdpyinfo, xrandr, fix
+    lspci args.  Renamed from xserver-xorg-core.py.
   * x11-common.install, x11-common.links:  Add symlinks for using apport
     across the major X source pkgs.
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to