xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 15 ++++++++-------
debian/changelog | 12 ++++++++++++
debian/local/Failsafe/failsafeXServer | 10 ++++++++++
3 files changed, 30 insertions(+), 7 deletions(-)
New commits:
commit 40a7be55406a9ad9a7154a734b21a61902262c35
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Mar 3 15:41:18 2010 -0800
Only force bugs with nvidia/fglrx loaded to nvidia/fglrx if they
are crashes with no backtrace.
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 43e58b1..0e109ee 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -59,13 +59,14 @@ def add_info(report, ui):
report['UnreportableReason'] = _('VMware is installed. If you upgraded recently be sure to upgrade vmware to a compatible version.')
return
- matches = command_output(['grep', 'fglrx', '/var/log/kern.log', '/proc/modules'])
- if (matches):
- report['SourcePackage'] = "fglrx-installer"
-
- matches = command_output(['grep', 'nvidia', '/var/log/kern.log', '/proc/modules'])
- if (matches):
- report['SourcePackage'] = "nvidia-graphics-drivers"
+ if report['ProblemType'] == 'Crash' and 'Traceback' not in report:
+ matches = command_output(['grep', 'fglrx', '/var/log/kern.log', '/proc/modules'])
+ if (matches):
+ report['SourcePackage'] = "fglrx-installer"
+
+ matches = command_output(['grep', 'nvidia', '/var/log/kern.log', '/proc/modules'])
+ if (matches):
+ report['SourcePackage'] = "nvidia-graphics-drivers"
attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf')
attach_file(report, '/var/log/Xorg.0.log', 'XorgLog')
diff --git a/debian/changelog b/debian/changelog
index 8dd7745..e6e1220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ xorg (1:7.5+1ubuntu12) lucid; urgency=low
set it up ourselves in order to get $LANG and $LANGUAGE so that
translations work properly.
(LP: #528908)
+ * debian/apport/source_xorg.py:
+ + Only file crash bugs with no traceback against nvidia/fglrx
- -- Bryce Harrington <bryce@ubuntu.com> Wed, 03 Mar 2010 15:29:44 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 03 Mar 2010 15:36:28 -0800
xorg (1:7.5+1ubuntu11) lucid; urgency=low
commit 49c84862d7f76c147c4ea5d26f7b0ba970e35d5e
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed Mar 3 15:31:24 2010 -0800
Fix $LANG with udev so translations appear properly
diff --git a/debian/changelog b/debian/changelog
index dbead1c..8dd7745 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xorg (1:7.5+1ubuntu12) lucid; urgency=low
+
+ * debian/local/Failsafe:
+ + udev rules don't have a particular environment set, so we must
+ set it up ourselves in order to get $LANG and $LANGUAGE so that
+ translations work properly.
+ (LP: #528908)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Wed, 03 Mar 2010 15:29:44 -0800
+
xorg (1:7.5+1ubuntu11) lucid; urgency=low
* Reapply changes from 1:7.5+1ubuntu6, which got clobbered by a later
diff --git a/debian/local/Failsafe/failsafeXServer b/debian/local/Failsafe/failsafeXServer
index b816b7a..d43e3c0 100755
--- a/debian/local/Failsafe/failsafeXServer
+++ b/debian/local/Failsafe/failsafeXServer
@@ -24,6 +24,16 @@
# not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
+# Upstart jobs don't have a particular environment, we need to source the
+# variables needed for localization ourselves
+if [ -r /etc/default/locale ]; then
+ . /etc/default/locale
+ export LANG LANGUAGE
+elif [ -r /etc/environment ]; then
+ . /etc/environment
+ export LANG LANGUAGE
+fi
+
xorg_conf_failsafe=${BPX_XORG_CONF_FAILSAFE:-"/etc/X11/xorg.conf.failsafe"}
xorg_conf=${BPX_XORG_CONF:-"/etc/X11/xorg.conf"}
fallback_driver=${BPX_FALLBACK_DRIVER:-"vesa"}
Reply to: