diff -u gdm-2.20.9/debian/control gdm-2.20.9/debian/control
--- gdm-2.20.9/debian/control
+++ gdm-2.20.9/debian/control
@@ -31,8 +31,7 @@
                gnome-pkg-tools,
                quilt,
                zenity,
-               libpopt-dev,
-               xserver-xorg
+               libpopt-dev
 Standards-Version: 3.8.0
 
 Package: gdm
diff -u gdm-2.20.9/debian/rules gdm-2.20.9/debian/rules
--- gdm-2.20.9/debian/rules
+++ gdm-2.20.9/debian/rules
@@ -22,7 +22,11 @@
 		--disable-scrollkeeper \
 		--enable-ipv6=yes \
 		--with-prefetch=yes \
-		--enable-secureremote=yes
+		--enable-secureremote=yes \
+		X_PATH="/usr/bin" \
+		X_SERVER_PATH="/usr/bin" \
+		X_SERVER="/usr/bin/X" \
+		X_CONFIG_OPTIONS="-audit 0"
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 	configure_flags += --with-selinux
diff -u gdm-2.20.9/debian/changelog gdm-2.20.9/debian/changelog
--- gdm-2.20.9/debian/changelog
+++ gdm-2.20.9/debian/changelog
@@ -1,3 +1,10 @@
+gdm (2.20.9-2) UNRELEASED; urgency=low
+
+  * Drop the build-dep on xserver-xorg, change configure.ac to bypass the
+    check for the X server path.
+
+ -- Julien Cristau <jcristau@debian.org>  Thu, 16 Apr 2009 19:27:05 +0200
+
 gdm (2.20.9-1) unstable; urgency=low
 
   * gdm.install: install the desktop files in 
diff -u gdm-2.20.9/debian/control.in gdm-2.20.9/debian/control.in
--- gdm-2.20.9/debian/control.in
+++ gdm-2.20.9/debian/control.in
@@ -31,8 +31,7 @@
                gnome-pkg-tools,
                quilt,
                zenity,
-               libpopt-dev,
-               xserver-xorg
+               libpopt-dev
 Standards-Version: 3.8.0
 
 Package: gdm
only in patch2:
unchanged:
--- gdm-2.20.9.orig/configure.ac
+++ gdm-2.20.9/configure.ac
@@ -1121,7 +1121,9 @@
 # and /usr/X11 since they often symlink to each other, and configure
 # should use the more stable location (the real directory) if possible.
 #
-if test -x /usr/X11/bin/Xserver; then
+if test x"$X_SERVER" != x; then
+   :
+elif test -x /usr/X11/bin/Xserver; then
    X_PATH="/usr/X11/bin"
    X_SERVER_PATH="/usr/X11/bin"
    X_SERVER="/usr/X11/bin/Xserver"