This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goclient. from abf9273 Update Danish translation file. new 1535c0d Don't use ancient Debianism's for ssh options (ProtocolKeepAlives). (Fixes: #434). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ sshprocess.cpp | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goclient. commit 1535c0d39525d9a746831933eee6c5a1e742cdae Author: Orion Poplawski <orion@cora.nwra.com> Date: Thu Feb 20 14:08:16 2014 +0100 Don't use ancient Debianism's for ssh options (ProtocolKeepAlives). (Fixes: #434). --- debian/changelog | 2 ++ sshprocess.cpp | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 096aec2..f08604b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low [ Orion Poplawski ] * New upstream version (4.0.1.4): - Fix password connection with libssh 0.6.0 + - Don't use ancient Debianism's for ssh options (ProtocolKeepAlives). + (Fixes: #434). [ Martti Pitkanen ] * New upstream version (4.0.1.4): diff --git a/sshprocess.cpp b/sshprocess.cpp index ebf6fc1..e283ab4 100755 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -31,11 +31,7 @@ #undef DEBUG // #define DEBUG -#ifdef Q_OS_DARWIN #define KEEPALIVE_OPTION " -o ServerAliveInterval=60 " -#else -#define KEEPALIVE_OPTION " -o ProtocolKeepAlives=60 " -#endif SshProcess::SshProcess(SshMasterConnection* master, int pid): QObject(0) { -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git