[Pkg-nx-commits] r17 - in freenx/trunk/debian: . patches

[Stefan Lippers-Hollmann]

Author: slh-guest
Date: 2005-07-26 21:13:53 +0000 (Tue, 26 Jul 2005)
New Revision: 17

Added:
   freenx/trunk/debian/patches/nomachine-1.5.0-client-compatibility.dpatch
Modified:
   freenx/trunk/debian/changelog
   freenx/trunk/debian/patches/00list
Log:
implement upstream patch for initial nxclient 1.5.0 compatibility.


Modified: freenx/trunk/debian/changelog
===================================================================
--- freenx/trunk/debian/changelog	2005-07-20 11:37:01 UTC (rev 16)
+++ freenx/trunk/debian/changelog	2005-07-26 21:13:53 UTC (rev 17)
@@ -2,8 +2,9 @@
 
   * new upstream version.
   * initial svn commit.
+  * implement upstream patch for initial nxclient 1.5.0 compatibility.
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Wed, 20 Jul 2005 12:10:54 +0200
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Wed, 26 Jul 2005 23:12:24 +0200
 
 freenx (0.4.1-0alpha5) experimental; urgency=low
 

Modified: freenx/trunk/debian/patches/00list
===================================================================
--- freenx/trunk/debian/patches/00list	2005-07-20 11:37:01 UTC (rev 16)
+++ freenx/trunk/debian/patches/00list	2005-07-26 21:13:53 UTC (rev 17)
@@ -1 +1,2 @@
 01_binpath.dpatch
+nomachine-1.5.0-client-compatibility.dpatch

Added: freenx/trunk/debian/patches/nomachine-1.5.0-client-compatibility.dpatch
===================================================================
--- freenx/trunk/debian/patches/nomachine-1.5.0-client-compatibility.dpatch	2005-07-20 11:37:01 UTC (rev 16)
+++ freenx/trunk/debian/patches/nomachine-1.5.0-client-compatibility.dpatch	2005-07-26 21:13:53 UTC (rev 17)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## nomachine-1.5.0-client-compatibility.diff by Stefan Lippers-Hollmann <s.l-h at gmx.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixed reconnection problems with !M 1.5.0 client.
+
+ at DPATCH@
+diff -u -u -r1.64 nxserver
+--- freenx-0.4.2/nxserver	16 Jul 2005 15:45:37 -0000	1.64
++++ freenx-0.4.2.patched/nxserver	26 Jul 2005 15:57:30 -0000
+@@ -223,7 +223,7 @@
+ 		echo "------- ---------------- -------------------------------- -------- ----- -------------- --------- ----------------------" >> $TMPFILE
+ 	else
+ 		echo "Display Type             Session ID                       Options  Depth Screen         Status      Session Name" >> $TMPFILE
+-		echo " ------- ---------------- -------------------------------- -------- ----- -------------- ----------- ------------------------------" >> $TMPFILE
++		echo "------- ---------------- -------------------------------- -------- ----- -------------- ----------- ------------------------------" >> $TMPFILE
+ 	fi
+ 	for i in $NX_SESS_DIR/running/*
+ 	do
+@@ -249,7 +249,7 @@
+ 			then
+ 				available="Yes"
+ 			fi
+-			echo -e "$(getparam display)\t$(getparam type)\t$(getparam sessionId)\t$options\t$depth\t$geom\t$available\t$(getparam sessionName)" >> $TMPFILE
++			printf "%-7s %-16s %32s %8s %5s %-14s %-11s %s" "$(getparam display)" "$(getparam type)" "$(getparam sessionId)" "$options" "$depth" "$geom" "$available" "$(getparam sessionName)" >> $TMPFILE
+ 		fi
+ 		egrep -q "^userName=$1$" $i && let SESSION_COUNT_USER=$SESSION_COUNT_USER+1
+ 	done
+@@ -894,6 +894,9 @@
+ 			then
+ 				# disabled due to problems with 1.4.0-5 client
+ 				#session_list_user_suspended "$USER" 'Suspended$|^status=Running$' "$(getparam geometry)" "$(getparam type)" | log_tee
++				session_list_user_suspended "$USER" 'Suspended' "$(getparam geometry)" "$(getparam type)" | log_tee
++			elif [ "$status" = "suspended,running" -o "$status" = "suspended" ] # since 1.5.0
++			then
+ 				session_list_user_suspended "$USER" 'Suspended' "$(getparam geometry)" "$(getparam type)" | log_tee
+ 			else
+ 				session_list_user "$USER" | log_tee