This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 6e1ecbd33a11306037ac52b08e144c1846eef667 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Thu Jul 10 12:41:51 2014 +0200 On Windows rename x2goclient.exe to x2goclient-mainprocess.exe and x2gohelper.exe to x2goclient.exe. --- debian/changelog | 2 ++ x2goclient.pro | 2 ++ x2gohelper/x2gohelper.cpp | 2 +- x2gohelper/x2gohelper.pro | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d2f812..9b5ecfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ x2goclient (4.0.3.0-0x2go1) UNRELEASED; urgency=low - Grammar fix in russian translation. - Add x2gohelper to start X2Go Client on Windows and clean child processes if X2Go Client crashes. (Fixes: #525). + - On Windows rename x2goclient.exe to x2goclient-mainprocess.exe and + x2gohelper.exe to x2goclient.exe. [ Mike DePaulo ] * New upstream release (4.0.3.0): diff --git a/x2goclient.pro b/x2goclient.pro index 99d0fb7..386b6aa 100755 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -182,6 +182,8 @@ win32-* { message(building $$TARGET for windows without ldap and cups) LIBS += -lwinspool -lws2_32 CONFIG += static release + TARGET = x2goclient-mainprocess + } QT += svg network ICON = icons/x2go-mac.icns diff --git a/x2gohelper/x2gohelper.cpp b/x2gohelper/x2gohelper.cpp index 5f0bd42..d12214c 100644 --- a/x2gohelper/x2gohelper.cpp +++ b/x2gohelper/x2gohelper.cpp @@ -70,7 +70,7 @@ int main(int argc, char* argv[]) args<<argv[i]; } QProcess proc; - QString executable="x2goclient.exe"; + QString executable="x2goclient-mainprocess.exe"; proc.start(executable, args); if(!proc.waitForStarted(4000)) { diff --git a/x2gohelper/x2gohelper.pro b/x2gohelper/x2gohelper.pro index 1ac685e..f30508b 100644 --- a/x2gohelper/x2gohelper.pro +++ b/x2gohelper/x2gohelper.pro @@ -3,7 +3,7 @@ ###################################################################### TEMPLATE = app -TARGET = +TARGET = x2goclient DEPENDPATH += . INCLUDEPATH += . -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git