[X2Go-Commits] [x2goclient] 01/01: Cygwin bundle 20160121-1 -> 20160121-2

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit 4fa7c6ee2176b959687c735333c1ec54a1f02dd1
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Wed May 18 14:00:06 2016 -0400

    Cygwin bundle 20160121-1 -> 20160121-2
---
 copy-deps-win32.bat |    2 +-
 debian/changelog    |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/copy-deps-win32.bat b/copy-deps-win32.bat
index dfdb19e..f4a2f9e 100755
--- a/copy-deps-win32.bat
+++ b/copy-deps-win32.bat
@@ -2,7 +2,7 @@ if "%~3"=="" (
 	echo "Usage: copy-deps-win32.bat path-to-x2goclient-contrib path-to-OpenSSL-Win32 destination"
 	goto :a
 )
-xcopy /E /Y    %1\cygwin\20160121-1_bin %3\ || exit /b  %errorlevel%
+xcopy /E /Y    %1\cygwin\20160121-2_bin %3\ || exit /b  %errorlevel%
 del %3\nxproxy.exe.unstripped %3\libXcomp.a %3\libXcomp.dll.a || exit /b  %errorlevel%
 xcopy /E /Y    %1\libssh\0.7.0-x2go1-mingw482_bin\bin\libssh.dll %3\ || exit /b  %errorlevel%
 xcopy /E /Y    %1\MinGW-DLLs\i686-4.8.2-release-posix-dwarf-rt_v3-rev3\libgcc_s_dw2-1.dll %3\ || exit /b  %errorlevel%
diff --git a/debian/changelog b/debian/changelog
index 77f7d12..6892aa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
   [ Mike DePaulo ]
   * New upstream release (4.0.5.2):
     - Windows: add sshd logging when using the --debug flag.
+    - Windows: Revert back to Cygwin components that have not been
+      "rebased"
 
   [ Martti Pitkänen ]
   * New upstream version (4.0.5.2):

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