- more upstart cleanup

[packages/gdm.git] / gdm-defaults.patch

diff --git a/gdm-defaults.patch b/gdm-defaults.patch
index aca7a7b795d07f67a7055ebf4c4225d53535f10b..729b917fdff68a8d521591442b238b8fee1f688d 100644 (file)
--- a/gdm-defaults.patch
+++ b/gdm-defaults.patch
@@ -1,17 +1,13 @@
-diff -urN gdm-2.20.0/configure.ac gdm-2.20.0.new/configure.ac
---- gdm-2.20.0/configure.ac    2007-09-17 16:46:22.000000000 +0200
-+++ gdm-2.20.0.new/configure.ac        2007-09-21 17:29:32.000000000 +0200
-@@ -1201,10 +1201,9 @@
- else
-    # what to do, what to do, this is wrong, but this just sets the
-    # defaults, perhaps this user is cross compiling or some such
--   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
--   X_SERVER_PATH="/usr/X11R6/bin"
--   X_SERVER="/usr/X11R6/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
-+   X_PATH="/usr/bin"
-+   X_SERVER_PATH="/usr/bin"
-+   X_SERVER="/usr/bin/Xorg"
-    X_CONFIG_OPTIONS="-audit 0"
+--- gdm-3.6.0/configure.ac.old 2012-10-09 16:20:23.603767954 +0200
++++ gdm-3.6.0/configure.ac     2012-10-09 16:23:22.486132194 +0200
+@@ -1273,6 +1273,10 @@ else
+    X_SERVER="/usr/bin/X"
  fi
  
++X_PATH="/usr/bin"
++X_SERVER_PATH="/usr/bin"
++X_SERVER="/usr/bin/Xorg vt9"
++
+ dnl ---------------------------------------------------------------------------
+ dnl - Check for Xnest / Xephyr support
+ dnl ---------------------------------------------------------------------------