xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 5 +++++
debian/changelog | 4 ++--
debian/x11-common.links | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 82bb4c47c583308b22f2de48fa3025049a9fb37d
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Nov 24 11:44:48 2009 -0800
Add/update apport hooks for various packages.
Add vmware detection to apport hook
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 17893bd..2d372fb 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -51,6 +51,11 @@ def add_info(report):
report['UnreportableReason'] = _('VirtualBox has installed a video driver which is incompatible with your version of X.org.')
return
+ product_name = report.get('dmi.product.name', '')
+ if product_name.startswith('VMware '):
+ report['UnreportableReason'] = _('VMware is installed. If you upgraded recently be sure to upgrade vmware to a compatible version.')
+ return
+
attach_file(report, '/etc/X11/xorg.conf', 'XorgConf')
attach_file(report, '/var/log/Xorg.0.log', 'XorgLog')
attach_file(report, '/var/log/Xorg.0.log.old', 'XorgLogOld')
diff --git a/debian/changelog b/debian/changelog
index cc4b4d1..b058e45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4+3ubuntu10) karmic; urgency=low
+xorg (1:7.4+3ubuntu10) karmic-proposed; urgency=low
* local/Failsafe/failsafeXServer: Since dexconf no longer produces
an xorg.conf, it will neither generate a failsafe xorg.conf, so now
@@ -6,7 +6,7 @@ xorg (1:7.4+3ubuntu10) karmic; urgency=low
session properly.
(LP: #477149)
- -- Bryce Harrington <bryce@ubuntu.com> Sun, 08 Nov 2009 23:59:36 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 09 Nov 2009 15:39:57 -0800
xorg (1:7.4+3ubuntu9) karmic-proposed; urgency=low
diff --git a/debian/x11-common.links b/debian/x11-common.links
index c75cec9..ec6d38a 100644
--- a/debian/x11-common.links
+++ b/debian/x11-common.links
@@ -8,8 +8,8 @@ usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/sou
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-71.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-96.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-173.py
-usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-177.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-180.py
+usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_nvidia-graphics-drivers-common.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_fglrx-installer.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_wacom-tools.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_x11-xserver-utils.py
@@ -25,6 +25,7 @@ usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/sou
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-keyboard.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-mouse.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-synaptics.py
+usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-input-wacom.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-ati.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-fbdev.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-geode.py
@@ -34,7 +35,6 @@ usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/sou
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-nouveau.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-openchrome.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-psb.py
-usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-radeonhd.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-radeon.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-savage.py
usr/share/apport/package-hooks/source_xorg.py usr/share/apport/package-hooks/source_xserver-xorg-video-sis.py
Reply to: