xorg: Changes to 'ubuntu'
debian/changelog | 13 ++++++++++---
debian/local/dexconf | 4 ++++
2 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 8bafbb3bb3e8ec8a288d528689cd937563627918
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Fri Apr 3 00:40:55 2009 -0700
Fix dexconf for kvm users
diff --git a/debian/changelog b/debian/changelog
index 5c8b9ee..ad08100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.4~5ubuntu18) jaunty; urgency=low
+
+ * local/dexconf: Don't use cirrus on kvm (Technical Corp. Device 1111)
+ (LP: #338219)
+
+ -- Bryce Harrington <bryce@ubuntu.com> Fri, 03 Apr 2009 00:35:49 -0700
+
xorg (1:7.4~5ubuntu17) jaunty; urgency=low
* apport/source_xorg.py:
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 5636deb..4880ba1 100755
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -191,6 +191,10 @@ DEVICE_USE_FBDEV="$RET"
QEMU_KVM=$(grep "QEMU Virtual CPU" /proc/cpuinfo || true)
if [ -n "$QEMU_KVM" ]; then
DEVICE_DRIVER="cirrus"
+ QEMU_VGA=$(lspci -v |grep "Technical Corp. Device 1111" || true)
+ if [ -n "$QEMU_VGA" ]; then
+ DEVICE_DRIVER="vesa"
+ fi
fi
VBOX_VIDEO=$(grep -e "^vbox " /proc/modules || true)
if [ -n "$VBOX_VIDEO" ]; then
commit 4ab7e2c4c8d4e0130537d9e0e7c1f31a4c2d8e29
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Apr 2 00:24:16 2009 -0700
Prep for release
diff --git a/debian/changelog b/debian/changelog
index b4be24d..5c8b9ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xorg (1:7.4~5ubuntu17) UNRELEASED; urgency=low
+xorg (1:7.4~5ubuntu17) jaunty; urgency=low
* apport/source_xorg.py:
- Include monitors.xml in apport reports.
* local/Failsafe/failsafeXinit:
- - Fix typo in xorg.conf filename
- - Fix mismatched quotes
+ - Fix typo in xorg.conf filename (LP: #348639)
+ - Fix mismatched quotes (Ref. 335678)
- Handle ESC key hits in zenity to not create a 0-length xorg.conf
-- Bryce Harrington <bryce@ubuntu.com> Sun, 29 Mar 2009 14:13:23 -0700
Reply to: