xorg: Changes to 'ubuntu'
debian/apport/xserver-xorg-core.py | 29
debian/changelog | 7
debian/changelog.Debian.old |11755 -------------------------------------
3 files changed, 19 insertions(+), 11772 deletions(-)
New commits:
commit 8f84ef4d44f03a7602455ccad497b1839dc7eaf7
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Aug 5 16:53:56 2008 -0700
Fix up apport script
diff --git a/debian/apport/xserver-xorg-core.py b/debian/apport/xserver-xorg-core.py
index b193df6..8884913 100644
--- a/debian/apport/xserver-xorg-core.py
+++ b/debian/apport/xserver-xorg-core.py
@@ -2,7 +2,7 @@
'''Xorg Apport interface
-Copyright (C) 2007 Canonical Ltd.
+Copyright (C) 2007, 2008 Canonical Ltd.
Author: Bryce Harrington <bryce.harrington@ubuntu.com>
This program is free software; you can redistribute it and/or modify it
@@ -15,19 +15,14 @@ the full text of the license.
import os.path
import subprocess
-XORG_CONF = '/etc/X11/xorg.conf'
-XORG_LOG = '/var/log/Xorg.0.log'
-
def add_info(report):
- # xorg.conf
try:
- report['XorgConf'] = open(XORG_CONF).read()
+ report['XorgConf'] = open('/etc/X11/xorg.conf').read()
except IOError:
pass
- # Xorg.0.log
try:
- report['XorgLog'] = open(XORG_LOG).read()
+ report['XorgLog'] = open('/var/log/Xorg.0.log').read()
except IOError:
pass
@@ -37,25 +32,27 @@ def add_info(report):
pass
try:
- script = subprocess.Popen(['lspci'], stdout=subprocess.PIPE)
+ script = subprocess.Popen(['lspci', '-vvnn'], stdout=subprocess.PIPE)
report['LsPci'] = script.communicate()[0]
except OSError:
pass
try:
- script = subprocess.Popen(['lspci', '-vmm'], stdout=subprocess.PIPE)
- report['LsPciVVM'] = script.communicate()[0]
+ script = subprocess.Popen(['lsmod'], stdout=subprocess.PIPE)
+ report['LsMod'] = script.communicate()[0]
except OSError:
pass
try:
- script = subprocess.Popen(['lsmod'], stdout=subprocess.PIPE)
- report['LsMod'] = script.communicate()[0]
+ script = subprocess.Popen(['xrandr --verbose'], stdout=subprocess.PIPE)
+ report['Xrandr'] = script.communicate()[0]
except OSError:
pass
-# TODO:
-#
-# xrandr --verbose
+ try:
+ script = subprocess.Popen(['xdpyinfo'], stdout=subprocess.PIPE)
+ report['xdpyinfo'] = script.communicate()[0]
+ except OSError:
+ pass
diff --git a/debian/changelog b/debian/changelog
index fc52bd0..d96f4e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
xorg (1:7.4~1ubuntu1) UNRELEASED; urgency=low
+ [ Bryce Harrington ]
+ * apport/xserver-xorg-core.py: Cleanup, add xdpyinfo, xrandr, fix
+ lspci args.
+
+ [ Timo Aaltonen ]
* Don't Recommend laptop-detect anymore.
* dexconf:
- remove laptop-detect/synaptics related cruft.
- remove keyboard and mouse sections.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Mon, 04 Aug 2008 17:34:36 +0300
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 05 Aug 2008 16:52:41 -0700
xorg (1:7.4~1) experimental; urgency=low
commit 3cf3c84bd6c4c3728c2774750eabe52889fa9e88
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Aug 5 16:33:58 2008 -0700
displayconfig-gtk moves to Suggests so Kubuntu doesn't have to carry gtk
diff --git a/debian/changelog b/debian/changelog
index 6ef909d..1f5d18d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg (1:7.4~0ubuntu2) intrepid; urgency=low
+
+ * debian/control: Moving displayconfig-gtk to Suggests. We are
+ phasing this out. Purportedly this will enable Kubuntu to fit on
+ the CD.
+
+ -- Bryce Harrington <bryce@ubuntu.com> Fri, 18 Jul 2008 04:31:44 -0700
+
xorg (1:7.4~0ubuntu1) intrepid; urgency=low
[ Bryce Harrington ]
diff --git a/debian/control b/debian/control
index 107d787..98c1aef 100644
--- a/debian/control
+++ b/debian/control
@@ -83,7 +83,8 @@ Architecture: any
Conflicts: xserver-xfree86 (<< 6.8.2.dfsg.1-1), xserver-common, x11-common (<< 1:7.3+11)
Replaces: xserver-common, x11-common (<< 1:7.3+11)
Depends: xserver-xorg-core (>= 2:1.4-3), xserver-xorg-video-all | xserver-xorg-video-2.9, xserver-xorg-input-all | xserver-xorg-input-2.1, ${shlibs:Depends}, ${misc:Depends}, xkb-data | xkb-data-legacy, x11-xkb-utils, mdetect
-Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}, displayconfig-gtk, laptop-detect
+Recommends: libgl1-mesa-dri, udev, ${F:XServer-Xorg-Detect-Depends}, laptop-detect
+Suggests: displayconfig-gtk
Description: the X.Org X server
This package depends on the full suite of the server and drivers for the
X.Org X server, as well as providing a configuration infrastructure to manage
Reply to: