This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 0.5.0.3-mswin in repository pyhoca-gui. commit c53771d1c18341251fa5f10d3e79393c29c1b1ef Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Jan 24 01:03:52 2015 -0500 Fix win32 build (Fixes: #649) Conflicts: debian/changelog Conflicts: debian/changelog --- debian/changelog | 8 ++++++++ pyhoca/wxgui/taskbar.py | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index f6453bb..1b0d1e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pyhoca-gui (0.5.0.3-mswin) UNRELEASED; urgency=medium + + [ Mike DePaulo ] + * New upstream version (0.5.0.3-mswin): + - Fix win32 build (missing win32gui.pyd) (Fixes: #649) + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 24 Jan 2015 7:40:00 -0500 + pyhoca-gui (0.5.0.3-0x2go1) unstable; urgency=medium [ Mike Gabriel ] diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index 58c1ca5..9bd1a1c 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