From f8f6e24aa7d7236edd637a11bb13fd43064e4cbe Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Tue, 27 Jan 2009 20:00:52 +0000 Subject: Apply a few more Slackware defaults --- freenx/build/nxpaths.diff | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'freenx/build/nxpaths.diff') diff --git a/freenx/build/nxpaths.diff b/freenx/build/nxpaths.diff index 16f8402e..6d230b5d 100644 --- a/freenx/build/nxpaths.diff +++ b/freenx/build/nxpaths.diff @@ -1,5 +1,6 @@ ---- freenx-server-0.7.3/nxloadconfig.orig 2008-12-31 13:15:36.000000000 +0100 -+++ freenx-server-0.7.3/nxloadconfig 2008-12-31 13:44:02.000000000 +0100 +diff -uarN freenx-server-0.7.3.orig/nxloadconfig freenx-server-0.7.3/nxloadconfig +--- freenx-server-0.7.3.orig/nxloadconfig 2008-08-22 02:44:43.000000000 +0200 ++++ freenx-server-0.7.3/nxloadconfig 2009-01-27 21:00:06.000000000 +0100 @@ -56,8 +56,8 @@ NX_LICENSE="OS (GPL, using backend: %BACKEND%)" @@ -11,6 +12,19 @@ PATH_LIB=$NX_DIR/lib NX_ETC_DIR=/etc/nxserver NX_SESS_DIR=/var/lib/nxserver/db +@@ -184,9 +184,9 @@ + + DEFAULT_X_WM="" + KILL_DEFAULT_X_WM="1" +-USER_X_STARTUP_SCRIPT=.Xclients +-DEFAULT_X_SESSION=/etc/X11/xdm/Xsession +-COMMAND_START_KDE=startkde ++USER_X_STARTUP_SCRIPT=.xinitrc ++DEFAULT_X_SESSION=/etc/X11/xinit/xinitrc ++COMMAND_START_KDE=/etc/X11/xinit/xinitrc.kde + COMMAND_START_GNOME=gnome-session + COMMAND_START_CDE=cdwm + COMMAND_XTERM=xterm @@ -317,7 +317,7 @@ [ -z "$APPLICATION_LIBRARY_PATH" ] && APPLICATION_LIBRARY_PATH=$PATH_LIB [ -z "$APPLICATION_LIBRARY_PRELOAD" ] && APPLICATION_LIBRARY_PRELOAD="$APPLICATION_LIBRARY_PATH/libX11.so.6.2:$APPLICATION_LIBRARY_PATH/libXext.so.6.4:$APPLICATION_LIBRARY_PATH/libXcomp.so:$APPLICATION_LIBRARY_PATH/libXcompext.so:$APPLICATION_LIBRARY_PATH/libXrender.so.1.2" -- cgit v1.2.3-65-gdbad