xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 14 ++++++++++----
debian/changelog | 20 +++++++++++++++-----
2 files changed, 25 insertions(+), 9 deletions(-)
New commits:
commit a2948c5b35108c1331ef224c2d24d92aa12d56b9
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Feb 3 15:24:58 2011 -0800
apport/source_xorg.py: Fix misspelling of CompositorRunning
* apport/source_xorg.py: Fix misspelling of CompositorRunning
* apport/source_xorg.py:
- Tag bugs with compiz version
- Trim out colored output from unity_support_test, which causes apport
to choke when reporting compiz bugs.
(LP: #710630)
- debian/x11-common.postinst.in,
debian/x11-common.postrm.in,
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 4135f44..5ad57ee 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -321,8 +321,14 @@ def attach_2d_info(report, ui=None):
def attach_3d_info(report, ui=None):
if os.environ.get('DISPLAY'):
if os.path.lexists('/usr/lib/nux/unity_support_test'):
- report['UnitySupportTest'] = command_output_quiet([
- '/usr/lib/nux/unity_support_test', '-p'])
+ try:
+ ust = command_output_quiet([
+ '/usr/lib/nux/unity_support_test', '-p'])
+ ust = ust.replace('\x1b','').replace('[0;38;48m','').replace('[1;32;48m','')
+ report['UnitySupportTest'] = ust
+ except AssertionError:
+ report['UnitySupportTest'] = 'FAILED TO RUN'
+
report['glxinfo'] = command_output_quiet(['glxinfo'])
attach_file_if_exists(report,
os.path.expanduser('~/.drirc'),
@@ -337,9 +343,9 @@ def attach_3d_info(report, ui=None):
compiz_version = string.join(versions, '.')
report['Tags'] += ' ' + report[compiz_version]
elif command_output_quiet(['pidof', 'kwin']):
- report['CompisitorRunning'] = 'kwin'
+ report['CompositorRunning'] = 'kwin'
else:
- report['CompisitorRunning'] = 'None'
+ report['CompositorRunning'] = 'None'
# Detect software rasterizer
glxinfo = report.get('glxinfo', '')
diff --git a/debian/changelog b/debian/changelog
index 57556b9..f73037c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-xorg (1:7.6~3ubuntu2) UNRELEASED; urgency=low
+xorg (1:7.6~3ubuntu4) UNRELEASED; urgency=low
- * apport/source_xorg.py: Tag bugs with compiz version
+ * apport/source_xorg.py: Fix misspelling of CompositorRunning
- -- Bryce Harrington <bryce@ubuntu.com> Mon, 31 Jan 2011 18:09:57 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 03 Feb 2011 15:24:18 -0800
+
+xorg (1:7.6~3ubuntu3) natty; urgency=low
+
+ * apport/source_xorg.py:
+ - Tag bugs with compiz version
+ - Trim out colored output from unity_support_test, which causes apport
+ to choke when reporting compiz bugs.
+ (LP: #710630)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 02 Feb 2011 16:03:57 -0800
xorg (1:7.6~3ubuntu1) natty; urgency=low
@@ -29,8 +39,8 @@ xorg (1:7.6~3ubuntu1) natty; urgency=low
of all packages to x11-common's.
- debian/scripts/vars.*: Don't drop nouveau, wacom, synaptics from *-all
- debian/xserver-xorg.postinst.in: Also migrate users from psb → vesa.
- - debian/x11-common.postinst.in:
- debian/x11-common.postrm.in:
+ - debian/x11-common.postinst.in,
+ debian/x11-common.postrm.in,
debian/x11-common.preinst.in: Remove obsolete conffiles from xinit.
* Bump Xserver dependency to 1.10RC1
Reply to: