Magellan Linux

Annotation of /trunk/nxserver-freenx/nxserver-freenx-0.5.0-xorg7.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 92 - (hide annotations) (download)
Thu Jan 4 23:21:10 2007 UTC (17 years, 4 months ago) by niro
File size: 1868 byte(s)
new files

1 niro 92 diff -Naur freenx-0.5.0.orig/node.conf.sample freenx-0.5.0/node.conf.sample
2     --- freenx-0.5.0.orig/node.conf.sample 2007-01-03 19:29:51.000000000 +0100
3     +++ freenx-0.5.0/node.conf.sample 2007-01-03 19:32:40.000000000 +0100
4     @@ -317,7 +317,7 @@
5    
6     # The key that contains the name of the complete path of command name
7     # 'xauth'.
8     -#COMMAND_XAUTH=/usr/X11R6/bin/xauth
9     +#COMMAND_XAUTH=/usr/bin/xauth
10    
11     # The key that contains the name of the complete path of command name
12     # 'smbmount'.
13     @@ -378,7 +378,7 @@
14     # for examples of useful parameters.
15     #AGENT_EXTRA_OPTIONS_RFB=""
16     #AGENT_EXTRA_OPTIONS_RDP=""
17     -#AGENT_EXTRA_OPTIONS_X=""
18     +#AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11"
19    
20     # The number of seconds we wait for the nxagent to start before
21     # deciding startup has failed
22     diff -Naur freenx-0.5.0.orig/nxclient freenx-0.5.0/nxclient
23     --- freenx-0.5.0.orig/nxclient 2007-01-03 19:29:51.000000000 +0100
24     +++ freenx-0.5.0/nxclient 2007-01-03 19:31:13.000000000 +0100
25     @@ -62,7 +62,7 @@
26     else
27     dialog_interface="xmessage"
28     xmessage=$(which xmessage 2>/dev/null)
29     - [ -z "$xmessage" ] && xmessage="/usr/X11R6/bin/xmessage"
30     + [ -z "$xmessage" ] && xmessage="/usr/bin/xmessage"
31     fi
32    
33     #
34     diff -Naur freenx-0.5.0.orig/nxloadconfig freenx-0.5.0/nxloadconfig
35     --- freenx-0.5.0.orig/nxloadconfig 2007-01-03 19:29:51.000000000 +0100
36     +++ freenx-0.5.0/nxloadconfig 2007-01-03 19:33:10.000000000 +0100
37     @@ -161,7 +161,7 @@
38     COMMAND_START_GNOME=gnome-session
39     COMMAND_START_CDE=cdwm
40     COMMAND_XTERM=xterm
41     -COMMAND_XAUTH=/usr/X11R6/bin/xauth
42     +COMMAND_XAUTH=/usr/bin/xauth
43     COMMAND_SMBMOUNT=smbmount
44     COMMAND_SMBUMOUNT=smbumount
45     COMMAND_NETCAT=netcat
46     @@ -184,7 +184,7 @@
47     COMMAND_SESSREG="sessreg"
48     AGENT_EXTRA_OPTIONS_RFB=""
49     AGENT_EXTRA_OPTIONS_RDP=""
50     -AGENT_EXTRA_OPTIONS_X=""
51     +AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11"
52     AGENT_STARTUP_TIMEOUT="60"
53     AGENT_FONT_SERVER=""
54     PROXY_TCP_NODELAY=""