[Pkg-nx-commits] r20 - freenx/trunk/debian/patches

[Stefan Lippers-Hollmann]

Author: slh-guest
Date: 2005-07-28 11:24:24 +0000 (Thu, 28 Jul 2005)
New Revision: 20

Removed:
   freenx/trunk/debian/patches/nomachine-1.5.0-client-compatibility.dpatch
Modified:
   freenx/trunk/debian/patches/00list
Log:
remove 0.4.3 backports to 0.4.2.


Modified: freenx/trunk/debian/patches/00list
===================================================================
--- freenx/trunk/debian/patches/00list	2005-07-28 11:22:44 UTC (rev 19)
+++ freenx/trunk/debian/patches/00list	2005-07-28 11:24:24 UTC (rev 20)
@@ -1,2 +1 @@
 01_binpath.dpatch
-nomachine-1.5.0-client-compatibility.dpatch

Deleted: freenx/trunk/debian/patches/nomachine-1.5.0-client-compatibility.dpatch
===================================================================
--- freenx/trunk/debian/patches/nomachine-1.5.0-client-compatibility.dpatch	2005-07-28 11:22:44 UTC (rev 19)
+++ freenx/trunk/debian/patches/nomachine-1.5.0-client-compatibility.dpatch	2005-07-28 11:24:24 UTC (rev 20)
@@ -1,38 +0,0 @@
-#! /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