[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-140-g154515d

[X2Go dev team]

The branch, master has been updated
       via  154515d69cafd6fcd42956f0912e33a2b63e5400 (commit)
       via  c204fa180cecd3e7e9d528e8542a1d2e324678e7 (commit)
      from  474c3ea4cf28b05d8c2655b725c3446fac9b6be0 (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 154515d69cafd6fcd42956f0912e33a2b63e5400
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 29 12:00:00 2012 +0200

    no import of pyhoca-gui executable for now...

commit c204fa180cecd3e7e9d528e8542a1d2e324678e7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 29 11:55:00 2012 +0200

    Windows binary: include pulseaudio 1.0 and vcxsrv 1.11.4.0.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 setup.py         |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 37d250a..874a671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -84,6 +84,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Make sure application really exits gracefully.
     - Provide a separate SetExitHandler function to catch signals from outside.
     - Use Pulseaudio 1.0 for developmental testing.
+    - Windows binary: include pulseaudio 1.0 and vcxsrv 1.11.4.0.
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/setup.py b/setup.py
index 3b5b66e..a843d8b 100755
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,8 @@ if platform.system() == 'Windows':
     # building from trunk
     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.0.4-2\\*.*'))]
-    pulseaudio_files = [("pulseaudio", glob(r'..\\pyhoca-contrib\\mswin\\pulseaudio-mswin\\pulseaudio-0.9.6\\*.*'))]
+    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\\*.*'))]
 
     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)).