xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 54 ++++++++++++++++++++----------------
debian/changelog | 12 ++++++--
debian/local/Failsafe/failsafeXinit | 10 +++++-
debian/rules | 2 +
4 files changed, 50 insertions(+), 28 deletions(-)
New commits:
commit 3628f21fe764aee88827235adaf65a7ff6da2bb4
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon Jan 25 15:38:16 2010 -0800
Complete i18n work on failsafeX
diff --git a/debian/changelog b/debian/changelog
index 06e03ab..d7ac53e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
-xorg (1:7.5+1ubuntu2) UNRELEASED; urgency=low
+xorg (1:7.5+1ubuntu2) lucid; urgency=low
+ [ David Planella ]
+ * Completed internationalisation support for failsafeXinit (LP: #335678)
+
[ Didier Roche ]
* debian/local/Xsession.d/20x11-common_process-args: Add support for
session command containing args (LP: #512235)
@@ -14,12 +17,12 @@ xorg (1:7.5+1ubuntu2) UNRELEASED; urgency=low
- Include make.log and dkms status info for proprietary drivers
- Collect -nouveau version
- Don't expect xorg.conf or Xorg.0.log.old to always be present
- - Don't run commands that need X if X is not available (lp: #368282)
+ - Don't run commands that need X if X is not available (LP: #368282)
[ Timo Aaltonen ]
* Add wacom back to -input-all.
- -- Bryce Harrington <bryce@ubuntu.com> Mon, 25 Jan 2010 15:28:49 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 25 Jan 2010 15:33:13 -0800
xorg (1:7.5+1ubuntu1) lucid; urgency=low
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index e3b0859..145d8db 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -37,6 +37,12 @@ app_title="$(gettext 'Ubuntu Failsafe-X')"
timestamp=$(date +%y%m%d%H%M%S)
+. gettext.sh
+TEXTDOMAIN=failsafexinit
+export TEXTDOMAIN
+TEXTDOMAINDIR=/usr/share/locale-langpack
+export TEXTDOMAINDIR
+
display_main_menu() {
zenity --list \
--radiolist \
@@ -94,7 +100,7 @@ display_filebug_menu() {
zenity --error --text "$(gettext 'Your bug could not be recorded successfully.\n')"
fi
else
- zenity --error --text "$(gettext 'Cannot file bug: $apport_hook is not present.')"
+ zenity --error --text "$(eval_gettext 'Cannot file bug: \$apport_hook is not present.')"
fi
}
@@ -167,7 +173,7 @@ save_config_logs() {
tar -cf ${xorg_backup_file} ${xorg_backup_dir}
rm -rf ${xorg_backup_dir}
- zenity --info --text "$(gettext 'Relevant configuration and log files have been saved to:\n')"$xorg_backup_file"\n$(gettext 'Bug reports can be submitted at http://www.launchpad.net/ubuntu/.\n')"
+ zenity --info --text "$(eval_gettext 'Relevant configuration and log files have been saved to:\n')"\$xorg_backup_file"\n$(gettext 'Bug reports can be submitted at http://www.launchpad.net/ubuntu/.\n')"
}
# Scan Xorg.0.log for errors
diff --git a/debian/rules b/debian/rules
index 76c0b47..66e53ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,7 @@ clean: cleanscripts
dh_testdir
dh_clean debian/local/X debian/po/pothead
-rm -rf stampdir
+ -rm -f debian/po-failsafe/failsafexinit.pot
-debconf-updatepo
@@ -56,6 +57,7 @@ build-stamp: scripts-stamp
dh_testdir
# build Debian's X server wrapper
$(CC) -Wall -g -O2 -o debian/local/X debian/local/xserver-wrapper.c
+ xgettext -f debian/po-failsafe/POTFILES.in -d failsafexinit -o debian/po-failsafe/failsafexinit.pot -L Shell
touch $@
build-arch-only: build
commit 9615baa9cb4e7b320b29501eb02941bc43656f1e
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon Jan 25 15:31:20 2010 -0800
Only run commands that need X11 if X11 is present
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 3646bff..130a6fc 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -75,22 +75,25 @@ def add_info(report):
# dkms status
report['DkmsStatus'] = command_output(['dkms', 'status'])
- # For resolution/multi-head bugs
- report['Xrandr'] = command_output(['xrandr', '--verbose'])
- attach_file_if_exists(report,
- os.path.expanduser('~/.config/monitors.xml'),
- 'monitors.xml')
-
-
- # For font dpi bugs
- report['xdpyinfo'] = command_output(['xdpyinfo'])
-
- # For 3D/Compiz/Mesa bugs
- report['glxinfo'] = command_output(['glxinfo'])
-
- # For keyboard bugs
- report['setxkbmap'] = command_output(['setxkbmap', '-print'])
- report['xkbcomp'] = command_output(['xkbcomp', ':0', '-w0', '-'])
+ # Only collect the following data if X11 is available
+ if os.environ.get('DISPLAY'):
+ # For resolution/multi-head bugs
+ report['Xrandr'] = command_output(['xrandr', '--verbose'])
+ attach_file_if_exists(report,
+ os.path.expanduser('~/.config/monitors.xml'),
+ 'monitors.xml')
+
+ # For font dpi bugs
+ if os.environ.get('DISPLAY'):
+ report['xdpyinfo'] = command_output(['xdpyinfo'])
+
+ # For 3D/Compiz/Mesa bugs
+ if os.environ.get('DISPLAY'):
+ report['glxinfo'] = command_output(['glxinfo'])
+
+ # For keyboard bugs
+ report['setxkbmap'] = command_output(['setxkbmap', '-print'])
+ report['xkbcomp'] = command_output(['xkbcomp', ':0', '-w0', '-'])
## DEBUGING ##
if __name__ == '__main__':
diff --git a/debian/changelog b/debian/changelog
index 871aa69..06e03ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,11 +10,16 @@ xorg (1:7.5+1ubuntu2) UNRELEASED; urgency=low
default configuration, just remove the xorg.conf after backing it up.
* debian/local/Failsafe/failsafeDexconf: Drop script since it is no
longer needed by failsafe.
+ * debian/apport/source_xorg.py: Update info apport collects on X issues
+ - Include make.log and dkms status info for proprietary drivers
+ - Collect -nouveau version
+ - Don't expect xorg.conf or Xorg.0.log.old to always be present
+ - Don't run commands that need X if X is not available (lp: #368282)
[ Timo Aaltonen ]
* Add wacom back to -input-all.
- -- Bryce Harrington <bryce@ubuntu.com> Mon, 25 Jan 2010 01:53:45 -0800
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 25 Jan 2010 15:28:49 -0800
xorg (1:7.5+1ubuntu1) lucid; urgency=low
commit dc25b5d5c9217359d79e1c85f55d82664c12caed
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon Jan 25 15:22:27 2010 -0800
Start showing data about -nouveau
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index e3d1b24..3646bff 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -39,6 +39,7 @@ def add_info(report):
"libdrm2",
"xserver-xorg-video-intel",
"xserver-xorg-video-ati"
+ "xserver-xorg-video-nouveau"
])
# Verify the bug is valid to be filed
commit a7883025b3954709ea7eb0a5dd3adb93add58ebc
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon Jan 25 15:21:13 2010 -0800
Add apport info useful for debugging proprietary driver issues
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 28c5ddd..e3d1b24 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -18,6 +18,7 @@ the full text of the license.
# - Trim lshal output to just required info
import os.path
+import glob
import subprocess
from apport.hookutils import *
@@ -66,11 +67,12 @@ def add_info(report):
attach_hardware(report)
report['PciDisplay'] = pci_devices(PCI_DISPLAY)
- # Detect proprietary drivers
- if 'fglrx' in report['ProcModules']:
- report['fglrx'] = recent_syslog(re.compile('fglrx'))
- else:
- report['fglrx'] = 'Not loaded'
+ # Gather any dkms make.log files for proprietary drivers
+ for logfile in glob.glob("/var/lib/dkms/*/*/build/make.log"):
+ attach_file(report, logfile, "make.log")
+
+ # dkms status
+ report['DkmsStatus'] = command_output(['dkms', 'status'])
# For resolution/multi-head bugs
report['Xrandr'] = command_output(['xrandr', '--verbose'])
commit 5c3a5688631b09e460a452af223351e55a2d942c
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon Jan 25 15:09:25 2010 -0800
These files are no longer guaranteed to be present, so check before
including.
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 2d372fb..28c5ddd 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -56,9 +56,9 @@ def add_info(report):
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_if_exists(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')
+ attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld')
attach_file_if_exists(report, '/var/log/gdm/:0.log', 'GdmLog')
attach_file_if_exists(report, '/var/log/gdm/:0.log.1', 'GdmLogOld')
Reply to: