This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from 6caa71f i18n update, rebuild .mo files new d02f989 Fix win32 build (Fixes: #649) new 7a1d83c Upgrade VcXsrv to 1.15.2.2-xp+vc2013+x2go1 new 8059179 Update changelog about nxproxy cygwin libraries The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 12 ++++++++++++ pyhoca/wxgui/taskbar.py | 7 +++++++ setup.py | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit d02f98964b825b426022c3b82f5bdde9053138b0 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Jan 24 01:03:52 2015 -0500 Fix win32 build (Fixes: #649) Conflicts: debian/changelog --- debian/changelog | 4 ++++ pyhoca/wxgui/taskbar.py | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4827fa1..fb3b4f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,10 @@ pyhoca-gui (0.5.0.4-0x2go1) UNRELEASED; urgency=medium * New upstream version (0.5.0.4): - Add Turkish translation to PyHoca-GUI. + [ Mike DePaulo ] + * New upstream version (0.5.0.4): + - Fix win32 build (missing win32gui.pyd) (Fixes: #649) + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:34:20 +0100 pyhoca-gui (0.5.0.3-0x2go1) unstable; urgency=medium diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index daf88bc..e7f1ce9 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -26,6 +26,13 @@ import x2go import wx import os +# Warning: If pyflakes says you should delete these 2 lines, +# then pyflakes is wrong. Deleting these 2 lines will break +# the Windows build by preventing win32gui.pyd from being +# copied over. +if x2go.X2GOCLIENT_OS == 'Windows': + import win32gui + # PyHoca-GUI modules import menus_taskbar import basepath -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 7a1d83cd84f610221e5adeb9909199010ce9dacc Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Jan 24 01:44:19 2015 -0500 Upgrade VcXsrv to 1.15.2.2-xp+vc2013+x2go1 Conflicts: debian/changelog setup.py --- debian/changelog | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fb3b4f5..640b302 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,11 @@ pyhoca-gui (0.5.0.4-0x2go1) UNRELEASED; urgency=medium [ Mike DePaulo ] * New upstream version (0.5.0.4): - Fix win32 build (missing win32gui.pyd) (Fixes: #649) + - Windows: Upgrade from VcXsrv-xp 1.14.3.2 to + VcXsrv 1.15.2.2-xp+vc2013+x2go1 + This new major version includes security fixes such as: + OpenSSL update to 1.0.1k + xorg-server CVE-2014-8091..8103 fixes -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:34:20 +0100 diff --git a/setup.py b/setup.py index 30e4b21..64aeec9 100755 --- a/setup.py +++ b/setup.py @@ -267,7 +267,7 @@ if platform.system() == 'Windows': dll_data_files = [("Microsoft.VC90.CRT", glob(r'..\\pyhoca-contrib\\mswin\\ms-vc-runtime\\*.*'))] nxproxy_files = [("nxproxy", glob(r'..\\pyhoca-contrib\\mswin\\nxproxy-mswin\\nxproxy-3.5.0.27_cygwin-2014-10-18\\*.*'))] pulseaudio_files = [("pulseaudio", glob(r'..\\pyhoca-contrib\\mswin\\pulseaudio-mswin\\pulseaudio-5.0-rev18\\*.*'))] - xserver_files = datafilelist('vcxsrv', r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\VcXsrv-1.15.2.1-xp+vc2013+x2go1') + xserver_files = datafilelist('vcxsrv', r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\VcXsrv-1.15.2.2-xp+vc2013+x2go1_bin') icon_files = datafilelist('icons\\PyHoca', r'icons\\PyHoca') img_files = [("img", glob(r'img\\*.*'))] -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 80591798b0905a2c55117dcf4028b9660b7d13ba Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Jan 24 01:56:26 2015 -0500 Update changelog about nxproxy cygwin libraries --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 640b302..8f0fdd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ pyhoca-gui (0.5.0.4-0x2go1) UNRELEASED; urgency=medium This new major version includes security fixes such as: OpenSSL update to 1.0.1k xorg-server CVE-2014-8091..8103 fixes + - Windows: Update nxproxy's Cygwin libraries from the + latest versions as of 2014-06-09 to the + latest versions as of 2014-10-18. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:34:20 +0100 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org