xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 8 +++++++-
debian/changelog | 9 +++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit fc8d0f70ce343ded9b5cda570297eb4126db5dec
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Jul 1 19:24:51 2010 -0700
changelog message
diff --git a/debian/changelog b/debian/changelog
index 3534fcc..3a08815 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.5+6ubuntu3) UNRELEASED; urgency=low
+
+ * debian/apport/source_xorg.py:
+ + Include .drirc if present
+ + Include gconf's /desktop/gnome/peripherals data
+ + Quell DkmsStatus no such file error message
+
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 01 Jul 2010 19:22:58 -0700
+
xorg (1:7.5+6ubuntu2) maverick; urgency=low
* debian/apport/source_xorg.py:
commit 3079432961ae62cf5de28778b37a3715269bada8
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Jul 1 19:19:55 2010 -0700
python is not bash
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index bd1d9df..ca89d49 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -120,7 +120,7 @@ Have you uninstalled the drivers from nvidia.com?"""):
# Capture KMS info if available
attach_drm_info(report)
- if [ os.path.lexists('/var/lib/dkms') ]:
+ if os.path.lexists('/var/lib/dkms'):
# Gather any dkms make.log files for proprietary drivers
for logfile in glob.glob("/var/lib/dkms/*/*/build/make.log"):
attach_file(report, logfile, "make.log")
commit 74cb39307586c16defe96f6f3e5066e7612c2c63
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Jul 1 19:19:26 2010 -0700
Include gconf details of peripherals
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index e91f027..bd1d9df 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -149,6 +149,9 @@ Have you uninstalled the drivers from nvidia.com?"""):
report['setxkbmap'] = command_output(['setxkbmap', '-print'])
report['xkbcomp'] = command_output(['xkbcomp', ':0', '-w0', '-'])
+ # For input device bugs
+ report['peripherals'] = command_output(['gconftool-2', '-R', '/desktop/gnome/peripherals'])
+
response = ui.yesno("Your gdm log files may help developers diagnose the bug, but may contain sensitive information. Do you want to include these logs in your bug report?")
if response == True:
report['GdmLog'] = root_command_output(['cat', '/var/log/gdm/:0.log'])
commit 55de88bd2642914966d2fea3efbb68ff7cd7fa15
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Jul 1 19:19:10 2010 -0700
Include .drirc if present
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 98b5bd6..e91f027 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -141,6 +141,9 @@ Have you uninstalled the drivers from nvidia.com?"""):
# For 3D/Compiz/Mesa bugs
report['glxinfo'] = command_output(['glxinfo'])
+ attach_file_if_exists(report,
+ os.path.expanduser('~/.drirc'),
+ 'drirc')
# For keyboard bugs
report['setxkbmap'] = command_output(['setxkbmap', '-print'])
Reply to: