xorg: Changes to 'debian-unstable'

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

 debian/changelog                |    6 +++---
 debian/xserver-xorg.postinst.in |    5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 456985d33f571008d9d803d0a1f5aabd0ceb3ae4
Author: David Nusinow <dnusinow@debian.org>
Date:   Sun Nov 25 23:41:58 2007 -0500

    Don't set default depth for tdfx in the xserver postinst
    
    The driver should be patched to handle this case now

diff --git a/debian/changelog b/debian/changelog
index f195d83..ddfd561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 xorg (1:7.3+7) UNRELEASED; urgency=low
 
   * Don't set driver-specific depths in xserver postinst
-    + For newport, vga, savage, and suncg6. These should all be handled in the
-      drivers themselves
+    + For newport, vga, savage, suncg6, and tdfx. These should all be handled 
+      in the drivers themselves
 
- -- David Nusinow <dnusinow@debian.org>  Sun, 25 Nov 2007 22:58:03 -0500
+ -- David Nusinow <dnusinow@debian.org>  Sun, 25 Nov 2007 23:41:08 -0500
 
 xorg (1:7.3+6) unstable; urgency=low
 
diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index 3512f50..91fd136 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1605,11 +1605,6 @@ xresprobeint() {
   db_input low xserver-xorg/config/monitor/use_sync_ranges || debug_echo "db_input low xserver-xorg/config/monitor/use_sync_ranges"
 
   case "$DEVICE_DRIVER" in
-    # Voodoo3's can't do 1024x768x24 and still cope with DRI; this is a common
-    # setup, apparently, so default to 16bpp.
-    tdfx)
-      DEFAULT_DEPTH=16
-      ;;
     # nVidia laptop chipsets should use 16bpp per default, or face horrific
     # colour banding issues, per Olivier Grawert and Trent Lloyd.
     nv)