debian/apport/source_xorg.py | 9 +++++++++
debian/changelog | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 282656d082e7ed4882cbf1cfc10f9b195c476b86
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Fri Jun 25 13:58:54 2010 +1000
Fix nvidia-settings command to actually attach the interesting information
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index a20e438..98b5bd6 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -98,7 +98,7 @@ Have you uninstalled the drivers from nvidia.com?"""):
# Attach output of nvidia-settings --query if we've got a display
# to connect to.
report['nvidia-settings'] = command_output(['nvidia-settings',
- '-q'])
+ '-q', 'all'])
if report['ProblemType'] == 'Crash' and 'Traceback' not in report:
commit f3a20a37d50703983770f87a2a67027c94b95564
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 23 17:08:04 2010 +1000
Update changelog
diff --git a/debian/changelog b/debian/changelog
index 72fca03..3534fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xorg (1:7.5+6ubuntu2) maverick; urgency=low
+ Detect a previous manual install of the nvidia.com drivers, and ask the
user if they have uninstalled them.
+ Attach the neccesary information for upstreaming nvidia binary bugs.
+ + Attach KMS connector information if available.
- -- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 15 Jun 2010
15:14:16 +1000
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Wed, 23 Jun 2010
17:07:53 +1000
xorg (1:7.5+6ubuntu1) maverick; urgency=low
commit 34576eb6f45cbdcccd4cc5b30ea45eecda7eeadb
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 23 17:07:27 2010 +1000
Attach KMS info to bug reports when available
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index d4d3e5c..a20e438 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -116,6 +116,9 @@ Have you uninstalled the drivers from nvidia.com?"""):
# Capture hardware
attach_hardware(report)
report['PciDisplay'] = pci_devices(PCI_DISPLAY)
+
+ # Capture KMS info if available
+ attach_drm_info(report)
if [ os.path.lexists('/var/lib/dkms') ]:
# Gather any dkms make.log files for proprietary drivers
commit 14a7357e06bd66c706ca6a186be78a7268c533cc
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Wed Jun 23 17:06:58 2010 +1000
Add output of nvidia-settings to nvidia bug reports
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index b739865..d4d3e5c 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -94,6 +94,12 @@ Have you uninstalled the drivers from nvidia.com?"""):
for logfile in glob.glob('/proc/driver/nvidia/*/*'):
if os.path.basename(logfile) != 'README':
attach_file(report, logfile)
+ if os.environ.get('DISPLAY'):
+ # Attach output of nvidia-settings --query if we've got a display
+ # to connect to.
+ report['nvidia-settings'] = command_output(['nvidia-settings',
+ '-q'])
+
if report['ProblemType'] == 'Crash' and 'Traceback' not in report:
nonfree_driver = nonfree_graphics_module()
--
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/e1os20h-0000fp...@alioth.debian.org
