The branch, twofactorauth has been updated via a60401acac4a0363b7dda3f07945058597fd9933 (commit) from 8aa34904dee26049e822203507e2336c6e744cd9 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/basepath.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index c915eb3..924740e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -87,6 +87,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Windows binary: include pulseaudio 1.0 and vcxsrv 1.11.4.0. - Provide code for Windows packaging (py2exe, NSIS) in PyHoca-GUI's setup.py. + - Ship PulseAudio 1.1 with PyHoca-GUI. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/pyhoca/wxgui/basepath.py b/pyhoca/wxgui/basepath.py index 9ac8dca..4de71b4 100644 --- a/pyhoca/wxgui/basepath.py +++ b/pyhoca/wxgui/basepath.py @@ -30,7 +30,7 @@ if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOP else: _locale_location = os.path.join(_base_location, 'build', 'mo') _nxproxy_location = os.path.join(_base_location, '..', 'pyhoca-contrib', 'mswin', 'nxproxy-mswin', 'nxproxy.exe') - _pulseaudio_location = os.path.join(_base_location, '..', 'pyhoca-contrib', 'mswin', 'pulseaudio-mswin', 'pulseaudio-1.0dev-1090.4', 'bin', 'pulseaudio.exe') + _pulseaudio_location = os.path.join(_base_location, '..', 'pyhoca-contrib', 'mswin', 'pulseaudio-mswin', 'pulseaudio-1.1', 'pulseaudio.exe') else: if _X2GOCLIENT_OS == 'Windows': _base_location = os.path.abspath(os.path.curdir) diff --git a/setup.py b/setup.py index 462b47e..445ed4d 100755 --- a/setup.py +++ b/setup.py @@ -136,7 +136,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.0.4-2\\*.*'))] - pulseaudio_files = [("pulseaudio", glob(r'..\\pyhoca-contrib\\mswin\\pulseaudio-mswin\\pulseaudio-1.0dev-1090.4\\*.*'))] + pulseaudio_files = [("pulseaudio", glob(r'..\\pyhoca-contrib\\mswin\\pulseaudio-mswin\\pulseaudio-1.1\\*.*'))] xserver_files = datafilelist('vcxsrv', r'..\\pyhoca-contrib\\mswin\\vcxsrv-mswin\\vcxsrv-1.11.4.0') icon_files = datafilelist('icons\\PyHoca', r'icons\\PyHoca') 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)).