xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 7 +++++--
debian/changelog | 11 +++++++++++
2 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 4ef86f851228a6971e14e60f48102dcdf3c66f8c
Author: Bryce Harrington <bryce@canonical.com>
Date: Mon Apr 4 19:03:14 2011 -0700
* apport/source_xorg.py:
+ Wildcarding package names doesn't seem to work. Look for dri
experimental package directly.
(LP: #749809, #747725)
+ Include compiz version tag if the problem is a compiz crash
(LP: #744355)
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index d703a31..646f671 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -284,7 +284,8 @@ def attach_xorg_package_versions(report, ui=None):
for package in [
"xserver-xorg",
"libgl1-mesa-glx",
- "libgl1-mesa-dri*",
+ "libgl1-mesa-dri",
+ "libgl1-mesa-dri-experimental",
"libdrm2",
"compiz",
"xserver-xorg-video-intel",
@@ -332,7 +333,9 @@ def attach_3d_info(report, ui=None):
os.path.expanduser('~/.drirc'),
'drirc')
- if is_process_running('compiz'):
+ if (is_process_running('compiz') or
+ (report.get('SourcePackage','Unknown') == "compiz" and report.get('ProblemType', '') == 'Crash'
+ ):
report['CompositorRunning'] = 'compiz'
compiz_version = command_output(['compiz', '--version'])
if compiz_version:
diff --git a/debian/changelog b/debian/changelog
index c6095c3..cbc1fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xorg (1:7.6+4ubuntu2) natty; urgency=low
+
+ * apport/source_xorg.py:
+ + Wildcarding package names doesn't seem to work. Look for dri
+ experimental package directly.
+ (LP: #749809, #747725)
+ + Include compiz version tag if the problem is a compiz crash
+ (LP: #744355)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 04 Apr 2011 19:01:36 -0700
+
xorg (1:7.6+4ubuntu1) natty; urgency=low
[ Timo Aaltonen ]
Reply to: