xorg: Changes to 'ubuntu'

[Timo Aaltonen <tjaalton-guest@alioth.debian.org>]

 debian/changelog                |    9 +++++++++
 debian/xserver-xorg.postinst.in |    1 +
 2 files changed, 10 insertions(+)

New commits:
commit 912d6b4fc4b80092dacee70a96ebc0fb45b2929a
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date:   Mon Oct 20 10:00:20 2008 +0300

    debian/xserver-xorg.postinst.in: Fix forcing the vesa driver
    
    If xforcevesa is set on the kernel cmdline, feed DRIVERS_LIST with vesa so that setting
    the DRIVER works.  Debconf refuses to obey if the list of choices is empty. (LP:

diff --git a/debian/changelog b/debian/changelog
index da9935f..5bcf1ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.4~5ubuntu2) intrepid; urgency=low
+
+  * debian/xserver-xorg.postinst.in: If xforcevesa is set on the kernel
+    cmdline, feed DRIVERS_LIST with vesa so that setting the DRIVER works.
+    Debconf refuses to obey if the list of choices is empty.
+    (LP: #285562)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Mon, 20 Oct 2008 09:53:29 +0300
+
 xorg (1:7.4~5ubuntu1) intrepid; urgency=low
 
   * Fix leftover conflicts in debian/changelog.
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 808605d..1089279 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -554,6 +554,7 @@ fi
 
 if [ -n "$XFORCEVESA" ] || [ -n "$(grep xforcevesa /proc/cmdline)" ]; then
   # don't let the server autodetect the video card, but always use vesa instead
+  DRIVERS_LIST="vesa"
   DISCOVERED_VIDEO="vesa"
 fi