xorg: Changes to 'ubuntu'
debian/apport/source_xorg.py | 11 ++++++-----
debian/changelog | 8 ++++++++
debian/local/Failsafe/failsafeXServer | 4 +++-
debian/scripts/vars.amd64 | 1 +
debian/scripts/vars.i386 | 1 +
debian/scripts/vars.powerpc | 1 +
debian/scripts/vars.ppc64 | 1 +
7 files changed, 21 insertions(+), 6 deletions(-)
New commits:
commit fb0347ffa55242c02ceb9a9e857fb6a71148bcdc
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Feb 18 19:16:51 2010 -0800
Add -nouveau to -video-all.
diff --git a/debian/changelog b/debian/changelog
index d7ac53e..c04351f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.5+1ubuntu3) lucid; urgency=low
+
+ * debian/scripts/*: Add -nouveau to xserver-xorg-video-all.
+ * debian/apport/source_xorg.py: Check if dkms is present before pulling
+ info from it, to avoid error messages on FOSS-only systems.
+
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 11 Feb 2010 17:26:07 -0800
+
xorg (1:7.5+1ubuntu2) lucid; urgency=low
[ David Planella ]
diff --git a/debian/scripts/vars.amd64 b/debian/scripts/vars.amd64
index ad6717b..c78bb9f 100755
--- a/debian/scripts/vars.amd64
+++ b/debian/scripts/vars.amd64
@@ -13,6 +13,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+ xserver-xorg-video-nouveau, \
xserver-xorg-video-nv, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 6355c64..c70afe1 100755
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -15,6 +15,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-apm, \
xserver-xorg-video-intel, \
xserver-xorg-video-mga, \
xserver-xorg-video-neomagic, \
+ xserver-xorg-video-nouveau, \
xserver-xorg-video-nv, \
xserver-xorg-video-rendition, \
xserver-xorg-video-s3, \
diff --git a/debian/scripts/vars.powerpc b/debian/scripts/vars.powerpc
index a3513d7..af1e61e 100755
--- a/debian/scripts/vars.powerpc
+++ b/debian/scripts/vars.powerpc
@@ -7,6 +7,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
+ xserver-xorg-video-nouveau, \
xserver-xorg-video-nv, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
diff --git a/debian/scripts/vars.ppc64 b/debian/scripts/vars.ppc64
index d331787..0402ef5 100755
--- a/debian/scripts/vars.ppc64
+++ b/debian/scripts/vars.ppc64
@@ -7,6 +7,7 @@ XSERVER_XORG_VIDEO_DEPENDS="xserver-xorg-video-ati, \
xserver-xorg-video-chips, \
xserver-xorg-video-fbdev, \
xserver-xorg-video-mga, \
+ xserver-xorg-video-nouveau, \
xserver-xorg-video-nv, \
xserver-xorg-video-s3, \
xserver-xorg-video-s3virge, \
commit 1ad30ac47a4264904cb9132ae1323df9bfc36f40
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Fri Feb 12 14:57:02 2010 -0800
Use fbdev for kms
diff --git a/debian/local/Failsafe/failsafeXServer b/debian/local/Failsafe/failsafeXServer
index 9fb77eb..ce51e09 100755
--- a/debian/local/Failsafe/failsafeXServer
+++ b/debian/local/Failsafe/failsafeXServer
@@ -76,7 +76,9 @@ pciids_in_order() {
get_driver() {
machine=$(uname -m)
- if [ $machine = "ppc" ]; then
+ if grep -q -E '(nouveau|drm)fb' /proc/fb; then
+ echo "fbdev"
+ elif [ $machine = "ppc" ]; then
echo "fbdev"
elif [ $machine = "powerpc" ]; then
echo "fbdev"
commit b25e67a96d35cf366e0e534f62beb89b3f813bbb
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Feb 11 17:25:47 2010 -0800
Verify dkms stuff exists before trying to access it
diff --git a/debian/apport/source_xorg.py b/debian/apport/source_xorg.py
index 130a6fc..3fbb5c7 100644
--- a/debian/apport/source_xorg.py
+++ b/debian/apport/source_xorg.py
@@ -68,12 +68,13 @@ def add_info(report):
attach_hardware(report)
report['PciDisplay'] = pci_devices(PCI_DISPLAY)
- # 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")
+ if [ os.path.lexists('/var/lib/dkms') ]:
+ # 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'])
+ # dkms status
+ report['DkmsStatus'] = command_output(['dkms', 'status'])
# Only collect the following data if X11 is available
if os.environ.get('DISPLAY'):
Reply to: