rev 3636 - trunk/packages/kdebase/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-04-22 16:45:51 +0000 (Sat, 22 Apr 2006)
New Revision: 3636

Modified:
   trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
Log:
Look for binaries in /usr/bin, not /usr/X11R6/bin.


Modified: trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2006-04-21 21:36:57 UTC (rev 3635)
+++ trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2006-04-22 16:45:51 UTC (rev 3636)
@@ -20,6 +20,74 @@
    setLogo( "" );
 --- kde.orig/kdm/config.def
 +++ kde.patched/kdm/config.def
+@@ -47,11 +47,11 @@
+ #endif
+ 
+ #if defined(BSD) || defined(__linux__)
+-# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:" XBINDIR ":/usr/games"
+-# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" XBINDIR
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/games"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ #else
+-# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:" XBINDIR ":/usr/games:/usr/ucb"
+-# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" XBINDIR ":/etc:/usr/ucb"
++# define DEF_USER_PATH "/usr/local/bin:/usr/bin:/bin:/usr/games:/usr/ucb"
++# define DEF_SYSTEM_PATH "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/etc:/usr/ucb"
+ #endif
+ 
+ #if 0 /*def HASXDMAUTH*/
+@@ -71,12 +71,12 @@
+ #endif
+ 
+ #ifdef _AIX
+-# define DEF_SERVER_CMD XBINDIR "/X -T -force"
++# define DEF_SERVER_CMD KDE_BINDIR "/X -T -force"
+ #elif defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ /* we just assume that any free *nix installation has a recent xfree86/xorg */
+-# define DEF_SERVER_CMD XBINDIR "/X -br"
++# define DEF_SERVER_CMD KDE_BINDIR "/X -br"
+ #else
+-# define DEF_SERVER_CMD XBINDIR "/X"
++# define DEF_SERVER_CMD KDE_BINDIR "/X"
+ #endif
+ </code>
+ 
+@@ -1355,7 +1355,7 @@
+  This string is subject to word splitting.
+  </para><para>
+  The default is something reasonable for the system on which &kdm; was built,
+- like <command>/usr/X11R6/bin/X</command>.
++ like <command>/usr/bin/X</command>.
+ 
+ Key: ServerArgsLocal
+ Type: string
+@@ -1567,7 +1567,7 @@
+ 
+ Key: Xrdb
+ Type: string
+-Default: XBINDIR "/xrdb"
++Default: KDE_BINDIR "/xrdb"
+ User: core
+ Instance: #*/""
+ Merge: xdm
+@@ -1638,7 +1638,7 @@
+ 
+ Key: Session
+ Type: string
+-Default: XBINDIR "/xterm -ls -T"
++Default: KDE_BINDIR "/xterm -ls -T"
+ #Merge: xdm - incompatible!
+ User: core
+ # will be overwritten
+@@ -1657,7 +1657,7 @@
+ 
+ Key: FailsafeClient
+ Type: string
+-Default: XBINDIR "/xterm"
++Default: KDE_BINDIR "/xterm"
+ User: core
+ Instance: #*/""
+ Merge: xdm
 @@ -1921,10 +1921,10 @@
  
  Key: SessionsDirs
@@ -62,7 +130,7 @@
  Comment:
   Random seed for forging saved session types, etc. of unknown users.
   This value should be random but constant across the login domain.
-@@ -2578,7 +2578,7 @@
+@@ -2579,7 +2578,7 @@
  Type: bool
  Default: true
  User: greeter