[X2Go-Commits] [x2goclient] 01/02: Windows: Revert the fix for bug 594 as a test fix for bug 883.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.4.0-mswin-bug883test
in repository x2goclient.

commit d0d4e5cabf575bfb41f593ac2bc3f28df141ec71
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Tue Jun 23 09:36:54 2015 -0400

    Windows: Revert the fix for bug 594 as a test fix for bug 883.
---
 copy-deps-win32.bat |    2 +-
 debian/changelog    |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat
index 515fa68..5d53dc6 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\2008-9.0.21022.8-x86 %3\ || exit /b  %errorlevel%
 xcopy /E /Y    %1\pulse\6.0-11.1_bin %3\ || exit /b  %errorlevel%
 xcopy /E /Y    %1\PuTTY\0.64_bin %3\ || exit /b  %errorlevel%
-xcopy /E /Y /I %1\VcXsrv\1.17.0.0-2_bin %3\VcXsrv || exit /b  %errorlevel%
+xcopy /E /Y /I %1\VcXsrv\1.17.0.0-2-bug3test1_bin %3\VcXsrv || exit /b  %errorlevel%
 xcopy /E /Y    %1\zlib\1.2.8_bin\zlib1.dll %3\ || exit /b  %errorlevel%
 xcopy /E /Y    %1\zlib\x86-mingw4-1.2.7-1_bin\bin\libz.dll %3\ || exit /b  %errorlevel%
 xcopy /E /Y    %2\bin\ssleay32.dll %3\ || exit /b  %errorlevel%
diff --git a/debian/changelog b/debian/changelog
index ca9cec4..8bbe659 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
-x2goclient (4.0.4.0-2015.06.23) unstable; urgency=low
+x2goclient (4.0.4.0-2015.06.23-bug883-test1) unstable; urgency=low
+
+  [ Mike DePaulo ]
+  * New upstream release (4.0.4.0-2015.06.23-bug883test1):
+    - Windows: Revert the fix for bug 594 as a test fix for bug 883.
 
+ -- Mike DePaulo <mikedep333 at gmail.com>  Tue, 23 Jun 2015 9:35:00 -0400
+
+x2goclient (4.0.4.0-2015.06.23) unstable; urgency=low
   [ Mike DePaulo ]
   * New upstream release (4.0.4.0-2015.06.23):
     - Windows: Update bundled Win32 OpenSSL from 1.0.1m to 1.0.1o,

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git