debian/apport/source_xorg.py | 11 +++++++++++ debian/changelog | 11 +++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-)
New commits: commit 145d5f2bbd126e736ae58c7b0408dfe9a9932edd Author: Bryce Harrington <[email protected]> Date: Mon Oct 19 19:42:33 2009 -0700 Update changelog for release diff --git a/debian/changelog b/debian/changelog index fe869b6..778eabe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,18 @@ +xorg (1:7.4+3ubuntu7) karmic; urgency=low + + * Remove stray 60x11-common_localhost and dexconf.patch from prior upload. + + -- Bryce Harrington <[email protected]> Mon, 19 Oct 2009 19:41:23 -0700 + xorg (1:7.4+3ubuntu6) karmic; urgency=low - [ Bryce Harrington ] + * apport/source_xorg.py: Do not file bug if VirtualBox is in use, since + it provides its own video driver. * vars.*: Add explicit dependency on xserver-xorg-input-vmmouse to ensure it stays in main. (LP: #407816) - -- Timo Aaltonen <[email protected]> Wed, 16 Sep 2009 11:13:53 +0300 + -- Bryce Harrington <[email protected]> Mon, 19 Oct 2009 18:52:55 -0700 xorg (1:7.4+3ubuntu5) karmic; urgency=low commit f47a7c1933e9053fdcd4b35e4a4b5004872218fe Author: Bryce Harrington <[email protected]> Date: Tue Sep 8 18:29:45 2009 -0700 VirtualBox's x driver and non-Ubuntu kernels can cause X to crash, which really isn't X's fault and apport should not file these bugs against xorg-server since there's nothing we can do. diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py index e619da8..17893bd 100644 --- a/debian/apport/source_xorg.py +++ b/debian/apport/source_xorg.py @@ -40,6 +40,17 @@ def add_info(report): "xserver-xorg-video-ati" ]) + # Verify the bug is valid to be filed + version_signature = report.get('ProcVersionSignature', '') + if not version_signature.startswith('Ubuntu '): + report['UnreportableReason'] = _('The running kernel is not an Ubuntu kernel') + return + + bios = report.get('dmi.bios.version', '') + if bios.startswith('VirtualBox '): + report['UnreportableReason'] = _('VirtualBox has installed a video driver which is incompatible with your version of X.org.') + 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') -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
