The branch, master has been updated via 153a57fe55d6e1fd5583ae6b1a26e2fa3280e8f2 (commit) from 63cb99f90198e4f2d6dc74a4e39a0454d1a5b05e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 153a57fe55d6e1fd5583ae6b1a26e2fa3280e8f2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Mar 29 12:28:00 2012 +0200 more fixes for xserver bundling ----------------------------------------------------------------------- Summary of changes: setup.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/setup.py b/setup.py index 0d53a9b..0092b3e 100755 --- a/setup.py +++ b/setup.py @@ -48,7 +48,11 @@ if platform.system() == 'Windows': nxproxy_files = [("nxproxy", glob(r'..\\pyhoca-contrib\\mswin\\nxproxy-mswin\\nxproxy-3.0.4-2\\*.*'))] pulseaudio_files = [("pulseaudio", glob(r'..\\pyhoca-contrib\\mswin\\pulseaudio-mswin\\pulseaudio-1.0dev-1090.4\\*.*'))] xserver_files = [("vcxsrv", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\*'))] + \ - [("vcxsrv", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\.Xdefaults'))] + [("vcxsrv", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\.Xdefaults'))] + \ + [("vcxsrv\\locale", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\locale\\*'))] + \ + [("vcxsrv\\locale", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\locale\\*\\*'))] + \ + [("vcxsrv\\xkbdata", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\xkbdata\\*'))] + \ + [("vcxsrv\\xkbdata", glob(r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0\\xkbdata\\*\\*'))] icon_files = [ ("icons\\PyHoca\\16x16", glob(r'icons\\PyHoca\\16x16\\*.*')), hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).