xorg: Changes to 'debian-unstable'

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

 debian/changelog     |    7 ++++++-
 debian/local/dexconf |    3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit c8e867b6e44f476da4efa2410243a947aff18171
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date:   Thu Dec 20 20:43:41 2007 +0200

    dexconf: Remove reference to xserver-xorg/config/display/modes, which is no longer used.

diff --git a/debian/changelog b/debian/changelog
index 0f8611d..aeec2e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 xorg (1:7.3+9) UNRELEASED; urgency=low
 
+  [ Julien Cristau ]
   * Deregister old debconf questions before calling dexconf.  dexconf calls
     db_stop, and we can't use debconf after that.  Add a comment to that
     effect above the dexconf call in debian/xserver-xorg.postinst.in, to try
     to prevent future mistakes.  Thanks, Michael Vogt!
 
- -- Julien Cristau <jcristau@debian.org>  Mon, 17 Dec 2007 23:21:35 +0100
+  [ Timo Aaltonen ]
+  * dexconf: Remove reference to xserver-xorg/config/display/modes, 
+    which is no longer used.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Thu, 20 Dec 2007 20:41:15 +0200
 
 xorg (1:7.3+8) unstable; urgency=low
 
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 92d11df..c53636e 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -262,9 +262,6 @@ printf "EndSection\n" >&4
 
 ### SCREEN
 
-db_get xserver-$SERVER/config/display/modes
-DISPLAY_MODES="$(list_convert $RET)"
-
 exec 4>"$DEXCONFTMPDIR/Screen"
 cat >&4 <<SECTION
 Section "Screen"