The branch, master has been updated via 29315a21584c684382d2d5eecbe10e6e263f29e3 (commit) from 2b79c7ec5b87a4927686b7e5039cde74e1831953 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 29315a21584c684382d2d5eecbe10e6e263f29e3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Apr 17 00:29:53 2012 +0200 Use VcXsrv-1.12.0.1 when testing Python X2Go applications. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/defaults.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 46b6cb2..a8f88d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -101,6 +101,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Silence warnings that occur during session info queries in case a session startup has not yet been completed fully. - Use nxproxy-3.5.0.12 when testing Python X2Go applications. + - Use VcXsrv-1.12.0.1 when testing Python X2Go applications. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/defaults.py b/x2go/defaults.py index cb11513..095a162 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -265,8 +265,8 @@ if X2GOCLIENT_OS == 'Windows': 'VcXsrv_development': { 'display': 'localhost:40', 'process_name': 'vcxsrv.exe', - 'test_installed': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.11.4.0', 'vcxsrv.exe'), - 'run_command': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.11.4.0', 'vcxsrv.exe'), + 'test_installed': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.12.0.1', 'vcxsrv.exe'), + 'run_command': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.12.0.1', 'vcxsrv.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], }, 'Xming': { hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).