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

[Christopher Martin]

Author: chrsmrtn
Date: 2006-05-14 20:35:02 +0000 (Sun, 14 May 2006)
New Revision: 3754

Modified:
   trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
Log:
XDINDIR is now /usr/bin, so need to replace it with KDE_BINDIR.
It should all be set correctly, provided kdebase is built against
recent Sid.

(This therefore also helps backporters a bit)


Modified: trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2006-05-14 18:54:51 UTC (rev 3753)
+++ trunk/packages/kdebase/debian/patches/10_kdmrc_defaults.diff	2006-05-14 20:35:02 UTC (rev 3754)
@@ -36,22 +36,6 @@
  #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>
@@ -61,33 +45,6 @@
  
  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