xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 7 +++++++
debian/changelog | 6 ++++++
2 files changed, 13 insertions(+)
New commits:
commit 26cf7852fc355fc7b29c58e9e91f9891ecb90a70
Author: Bryce Harrington <bryce@canonical.com>
Date: Mon Jan 31 18:10:53 2011 -0800
apport/source_xorg.py: Tag bugs with compiz version
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 45ef285..a1ac074 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -292,6 +292,7 @@ def attach_xorg_package_versions(report, ui=None):
"xserver-xorg",
"libgl1-mesa-glx",
"libdrm2",
+ "compiz",
"xserver-xorg-video-intel",
"xserver-xorg-video-ati",
"xserver-xorg-video-nouveau"]:
@@ -330,6 +331,12 @@ def attach_3d_info(report, ui=None):
if command_output_quiet(['pidof', 'compiz']):
report['CompositorRunning'] = 'compiz'
+ compiz_version = command_output_quiet([
+ 'compiz', '--version'])
+ versions = string.split(compiz_version.replace(' ', '-'), '.')
+ versions.pop()
+ compiz_version = string.join(versions, '.')
+ report['Tags'] += ' ' + report[compiz_version]
elif command_output_quiet(['pidof', 'kwin']):
report['CompisitorRunning'] = 'kwin'
else:
diff --git a/debian/changelog b/debian/changelog
index a8e8539..57556b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg (1:7.6~3ubuntu2) UNRELEASED; urgency=low
+
+ * apport/source_xorg.py: Tag bugs with compiz version
+
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 31 Jan 2011 18:09:57 -0800
+
xorg (1:7.6~3ubuntu1) natty; urgency=low
* Merge from (unreleased) Debian experimental. Remaining Ubuntu changes:
Reply to: