This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 926355d7f4eb05c2ec197c879ffcd314c4bac972 Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Jan 25 20:20:19 2020 +0100 Windows: upgrade bundled VcXsrv to 1.20.6.0. --- copy-deps-win32.bat | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat index 23a7b9f..6094c0c 100755 --- a/copy-deps-win32.bat +++ b/copy-deps-win32.bat @@ -12,7 +12,7 @@ xcopy /E /Y %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libwinpth xcopy /E /Y %1\MSVC-DLLs\2013-12.0.21005.1-x86\msvcr120.dll %3\ || exit /b %errorlevel% xcopy /E /Y %1\pulse\7.1-2.2_bin %3\ || exit /b %errorlevel% xcopy /E /Y %1\PuTTY\0.73_bin %3\ || exit /b %errorlevel% -xcopy /E /Y /I %1\VcXsrv\1.20.1.4_bin %3\VcXsrv || exit /b %errorlevel% +xcopy /E /Y /I %1\VcXsrv\1.20.6.0_bin %3\VcXsrv || exit /b %errorlevel% xcopy /E /Y /I %1\x3270-fonts\3.6ga4\misc %3\VcXsrv\fonts\misc || exit /b %errorlevel% xcopy /E /Y %1\x3270-fonts\3.6ga4\copyright-x3270-fonts %3\VcXsrv\ || exit /b %errorlevel% rem We have to call mkfontscale and mkfontdir after updating the misc font directory. diff --git a/debian/changelog b/debian/changelog index 0111678..0f8a60b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -158,6 +158,7 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium look for "sftp-server" in the Qt 5.x code path. Luckily this only affects cases where we bundle sftp-server (which we don't) or where sftp-server is actually part of $PATH (which it usually shouldn't be). + - Windows: upgrade bundled VcXsrv to 1.20.6.0. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git