xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 12 ++++++------
debian/changelog | 9 +++++++++
2 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 98ae73a5ba0842f5c236617a5d5d9d06fdec68e7
Author: Bryce Harrington <bryce@canonical.com>
Date: Thu Feb 24 18:29:51 2011 -0800
apport/source_xorg.py: Fix compiz bug tagging to tag 'compiz-0.9' rather than 'compiz-0.9.2' (LP: #724598)
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 3a34119..9aca105 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -329,10 +329,10 @@ def attach_3d_info(report, ui=None):
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'] += ' ' + compiz_version
+ version = compiz_version.split(' ')[1]
+ version = version[:3]
+ compiz_version_string = 'compiz-%s' % version
+ report['Tags'] += ' ' + compiz_version_string
elif command_output_quiet(['pidof', 'kwin']):
report['CompositorRunning'] = 'kwin'
else:
diff --git a/debian/changelog b/debian/changelog
index c958085..7fbc233 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.6~3ubuntu8) natty; urgency=low
+
+ [Brian Murray]
+ * apport/source_xorg.py: Fix compiz bug tagging to tag 'compiz-0.9'
+ rather than 'compiz-0.9.2'
+ (LP: #724598)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 24 Feb 2011 18:27:30 -0800
+
xorg (1:7.6~3ubuntu7) natty; urgency=low
* Mark x11-common as Multi-Arch: foreign, so foreign-architecture libs
commit 43dd2648bb3b86e288fbdaa622fe887c244c3ef6
Author: Bryce Harrington <bryce@canonical.com>
Date: Tue Feb 22 17:56:16 2011 -0800
Further clarify why nvidia is getting detected
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 987484b..3a34119 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -208,9 +208,9 @@ def check_is_reportable(report, ui=None):
if os.path.exists('/var/log/nvidia-installer.log'):
# User has installed nVidia drivers manually at some point.
# This is likely to have caused problems.
- if ui and not ui.yesno("""It appears you may have installed the nVidia drivers manually from nvidia.com. This can cause problems with the Ubuntu-supplied drivers.
+ if ui and not ui.yesno("""It appears you may have installed the nVidia drivers manually from nvidia.com at some point in the past. This can cause problems with the Ubuntu-supplied drivers.
-If you have not already uninstalled the drivers downloaded from nvidia.com, please uninstall them and reinstall the Ubuntu packages before filing a bug with Ubuntu.
+If you have not already uninstalled the drivers downloaded from nvidia.com, please uninstall them and reinstall the Ubuntu packages before filing a bug with Ubuntu. If you have uninstalled them, then you may want to remove the file /var/log/nvidia-installer.log as well.
Have you uninstalled the drivers from nvidia.com?"""):
report['UnreportableReason'] = 'The drivers from nvidia.com are not supported by Ubuntu. Please uninstall them and test whether your problem still occurs.'
Reply to: