xorg: Changes to 'debian-unstable'

[David Nusinow <dnusinow@alioth.debian.org>]

 debian/changelog     |    7 +++++++
 debian/local/dexconf |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 5d32d55ad2edb479ca590361fc17c080da1c06db
Author: David Nusinow <dnusinow@debian.org>
Date:   Tue Jun 12 18:08:22 2007 -0400

    Allow no modes to be selected
    
    Don't use the dexconf function fetch to get the modes. This will fail when
    the value is empty by design. Just use db_get instead.

diff --git a/debian/changelog b/debian/changelog
index 7bbac7f..7adae53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.2-5) UNRELEASED; urgency=low
+
+  * Don't use the dexconf function fetch to get the modes. This will fail when
+    the value is empty by design. Just use db_get instead.
+
+ -- David Nusinow <dnusinow@debian.org>  Tue, 12 Jun 2007 18:03:31 -0400
+
 xorg (1:7.2-4) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/local/dexconf b/debian/local/dexconf
index 0d5b2d3..c5b2a9e 100644
--- a/debian/local/dexconf
+++ b/debian/local/dexconf
@@ -354,7 +354,7 @@ printf "EndSection\n" >&4
 
 fetch xserver-$SERVER/config/display/default_depth
 DISPLAY_DEFAULT_DEPTH="$RET"
-fetch xserver-$SERVER/config/display/modes
+db_get xserver-$SERVER/config/display/modes
 DISPLAY_MODES="$(list_convert $RET)"
 
 exec 4>"$DEXCONFTMPDIR/Screen"