debian/apport/source_xorg.py | 38 ++++++++++++++++++++++++------------ debian/changelog | 16 ++++++++++++++- debian/local/Failsafe/failsafeXinit | 4 +++ 3 files changed, 45 insertions(+), 13 deletions(-)
New commits: commit f3c50746de3a1512186807ea21ed65bc59554dc8 Author: Bryce Harrington <br...@bryceharrington.org> Date: Thu Feb 25 16:07:14 2010 -0800 Merge branch 'ubuntu' of ssh://bryce-gu...@alioth.debian.org/git/pkg-xorg/debian/xorg into ubuntu Conflicts: debian/changelog diff --git a/debian/changelog b/debian/changelog index d7e4ebc..7563577 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,7 +17,14 @@ xorg (1:7.5+1ubuntu9) lucid; urgency=low [ Timo Aaltonen ] * debian/x11-common.links: Add xf86-input-evtouch and -wacom. +<<<<<<< HEAD:debian/changelog -- Bryce Harrington <br...@ubuntu.com> Thu, 25 Feb 2010 15:07:29 -0800 +======= + [ Timo Aaltonen ] + * debian/x11-common.links: Add xf86-input-evtouch and -wacom. + + -- Bryce Harrington <br...@ubuntu.com> Tue, 23 Feb 2010 18:45:03 -0800 +>>>>>>> 29c9d8bb69670f9174d34e2fa8578bc4ad11c6bf:debian/changelog xorg (1:7.5+1ubuntu8) lucid; urgency=low commit c95e49837ec7e036e1c3cefa551db0b918917021 Author: Bryce Harrington <br...@bryceharrington.org> Date: Thu Feb 25 16:00:25 2010 -0800 Add option to restart X with new configuration diff --git a/debian/changelog b/debian/changelog index 385bc5b..d7e4ebc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg (1:7.5+1ubuntu9) UNRELEASED; urgency=low +xorg (1:7.5+1ubuntu9) lucid; urgency=low [ Bryce Harrington ] * debian/x11-common.links: @@ -17,7 +17,7 @@ xorg (1:7.5+1ubuntu9) UNRELEASED; urgency=low [ Timo Aaltonen ] * debian/x11-common.links: Add xf86-input-evtouch and -wacom. - -- Bryce Harrington <br...@ubuntu.com> Thu, 25 Feb 2010 14:54:14 -0800 + -- Bryce Harrington <br...@ubuntu.com> Thu, 25 Feb 2010 15:07:29 -0800 xorg (1:7.5+1ubuntu8) lucid; urgency=low diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit index 145d8db..7378437 100755 --- a/debian/local/Failsafe/failsafeXinit +++ b/debian/local/Failsafe/failsafeXinit @@ -54,6 +54,7 @@ display_main_menu() { FALSE RECONFIGURE "$(gettext 'Reconfigure graphics')" \ FALSE TROUBLESHOOT "$(gettext 'Troubleshoot the error')" \ FALSE EXIT_TO_CONSOLE "$(gettext 'Exit to console login')" \ + FALSE RESTART_X "$(gettext 'Restart X')" \ --hide-column 2 # TODO: 3 FILE_BUG "Report a bug about this failure" \ @@ -194,6 +195,7 @@ while : ; do RECONFIGURE ) choice=$(display_reconfigure_menu) ;; TROUBLESHOOT ) choice=$(display_troubleshooting_menu) ;; FILE_BUG ) choice=$(display_filebug_menu) ;; + RESTART_X ) with_gdm="restart"; break ;; ## Reconfigure Menu ## DEFAULT_CONFIG ) choice="RECONFIGURE"; default_config ;; @@ -217,6 +219,8 @@ if [ "x$with_gdm" = "xwith-gdm" ]; then XORGCONFIG="/etc/X11/xorg.conf" elif [ "x$with_gdm" = "xlow-res" ]; then XORGCONFIG=${xorg_conf} +elif [ "x$with_gdm" = "xrestart" ]; then + XORGCONFIG="" else chvt 2 exit commit 6a686880799c62faf4cf12bfc0b329ba34d8882e Author: Bryce Harrington <br...@bryceharrington.org> Date: Thu Feb 25 15:42:27 2010 -0800 Detect if nvidia or fglrx are loaded, and file bugs against the respective packages in these cases. diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py index 5a70e78..7ba696d 100644 --- a/debian/apport/source_xorg.py +++ b/debian/apport/source_xorg.py @@ -59,6 +59,14 @@ def add_info(report): 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" + attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf') attach_file(report, '/var/log/Xorg.0.log', 'XorgLog') attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld') diff --git a/debian/changelog b/debian/changelog index b4477b3..385bc5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,10 @@ xorg (1:7.5+1ubuntu9) UNRELEASED; urgency=low + Add tagging of release codename + Collect gdm logs as root + Remove extraneous checking of $DISPLAY + + Detect vbox, fglrx, and nvidia and file bugs against the respective + packages instead. + (LP: #516264) - [ Timo Aaltonen ] * debian/x11-common.links: Add xf86-input-evtouch and -wacom. commit f1736a6662d21360ed882ecfb2231a74bf142cfb Author: Bryce Harrington <br...@bryceharrington.org> Date: Thu Feb 25 15:07:15 2010 -0800 File vbox bugs against vbox diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py index d39c75d..5a70e78 100644 --- a/debian/apport/source_xorg.py +++ b/debian/apport/source_xorg.py @@ -12,11 +12,6 @@ option) any later version. See http://www.gnu.org/copyleft/gpl.html for the full text of the license. ''' -# TODO: -# - Create some general purpose routines (see source_network-manager.py) -# - Parse files to generate system_environment more concisely -# - Trim lshal output to just required info - import os.path import glob import subprocess @@ -56,7 +51,7 @@ def add_info(report): 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.') + report['SourcePackage'] = "virtualbox-ose" return product_name = report.get('dmi.product.name', '') diff --git a/debian/changelog b/debian/changelog index 68abeef..b4477b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,11 +6,16 @@ xorg (1:7.5+1ubuntu9) UNRELEASED; urgency=low + Add apport hook for nvidia-graphics-drivers + Add apport hook for -vmmouse (LP: #517664) + Remove apport hooks for packages now removed from repository + * debian/apport/source_xorg.py: + + Add tagging of release codename + + Collect gdm logs as root + + Remove extraneous checking of $DISPLAY + [ Timo Aaltonen ] * debian/x11-common.links: Add xf86-input-evtouch and -wacom. - -- Bryce Harrington <br...@ubuntu.com> Tue, 23 Feb 2010 18:45:03 -0800 + -- Bryce Harrington <br...@ubuntu.com> Thu, 25 Feb 2010 14:54:14 -0800 xorg (1:7.5+1ubuntu8) lucid; urgency=low commit c93c196e52ae7b7c2874cfe1c62fb15cd5154aec Author: Bryce Harrington <br...@bryceharrington.org> Date: Thu Feb 25 14:54:39 2010 -0800 Remove extraneous checking of $DISPLAY diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py index 1c9fdab..d39c75d 100644 --- a/debian/apport/source_xorg.py +++ b/debian/apport/source_xorg.py @@ -89,12 +89,10 @@ def add_info(report): 'monitors.xml') # For font dpi bugs - if os.environ.get('DISPLAY'): - report['xdpyinfo'] = command_output(['xdpyinfo']) + report['xdpyinfo'] = command_output(['xdpyinfo']) # For 3D/Compiz/Mesa bugs - if os.environ.get('DISPLAY'): - report['glxinfo'] = command_output(['glxinfo']) + report['glxinfo'] = command_output(['glxinfo']) # For keyboard bugs report['setxkbmap'] = command_output(['setxkbmap', '-print']) commit ca2c66490b89548410662e4eb1a1b5150fca9b4e Author: Bryce Harrington <br...@bryceharrington.org> Date: Thu Feb 25 14:28:27 2010 -0800 gdm logs require root access diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py index 80329dd..1c9fdab 100644 --- a/debian/apport/source_xorg.py +++ b/debian/apport/source_xorg.py @@ -67,8 +67,6 @@ def add_info(report): attach_file_if_exists(report, '/etc/X11/xorg.conf', 'XorgConf') attach_file(report, '/var/log/Xorg.0.log', 'XorgLog') 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') # Capture hardware attach_hardware(report) @@ -102,6 +100,12 @@ def add_info(report): report['setxkbmap'] = command_output(['setxkbmap', '-print']) report['xkbcomp'] = command_output(['xkbcomp', ':0', '-w0', '-']) + response = ui.yesno("Your gdm log files may help developers diagnose the bug, but may contain sensitive information. Do you want to include these logs in your bug report?") + if response == True: + attach_file_if_exists(report, '/var/log/gdm/:0.log', 'GdmLog') + attach_file_if_exists(report, '/var/log/gdm/:0.log.1', 'GdmLog1') + attach_file_if_exists(report, '/var/log/gdm/:0.log.2', 'GdmLog2') + report.setdefault('Tags', '') report['Tags'] += ' ' + ' '.join(tags) commit a871410c40500d4d3f35c6643d30e25a4d38cf9c Author: Bryce Harrington <br...@bryceharrington.org> Date: Thu Feb 25 14:25:36 2010 -0800 Add tagging of release codename diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py index 3fbb5c7..80329dd 100644 --- a/debian/apport/source_xorg.py +++ b/debian/apport/source_xorg.py @@ -28,8 +28,14 @@ def installed_version(pkg): return output.split('\n')[1].replace("Installed: ", "") def add_info(report): + tags = [] + # Build System Environment + codename = command_output(['lsb_release','-c']).split(": ")[1] + tags.append(codename) + report['system'] = "distro: Ubuntu\n" + report['system'] += "codename: " + codename report['system'] += "architecture: " + command_output(['uname','-m']) report['system'] += "kernel: " + command_output(['uname','-r']) @@ -96,6 +102,9 @@ def add_info(report): report['setxkbmap'] = command_output(['setxkbmap', '-print']) report['xkbcomp'] = command_output(['xkbcomp', ':0', '-w0', '-']) + report.setdefault('Tags', '') + report['Tags'] += ' ' + ' '.join(tags) + ## DEBUGING ## if __name__ == '__main__': report = {} -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1nknm7-0007cx...@alioth.debian.org