This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 0.5.0.3-mswin in repository pyhoca-gui. at 16ed09d release 0.5.0.3-20150124 This branch includes the following new commits: new c53771d Fix win32 build (Fixes: #649) new 7bcfc29 Upgrade VcXsrv to 1.15.2.2-xp+vc2013+x2go1 new 48a6e76 Update changelog about nxproxy cygwin libraries new ab6a7dc Windows: Include all fonts in NSIS installer, make them optional, and install only "misc" by default. (Fixes: #108) new 16ed09d release 0.5.0.3-20150124 The 5 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. -- 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 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
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 7bcfc29dae0c70ab620c3bf60d921eda9ad5a2ba 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 1b0d1e2..cb6de60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,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) + - 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> Sat, 24 Jan 2015 7:40:00 -0500 diff --git a/setup.py b/setup.py index dcb4035..8a4ebd8 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 0.5.0.3-mswin in repository pyhoca-gui. commit 48a6e76c7f528459c7a03093c3f1da82288871e8 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 cb6de60..16143b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ pyhoca-gui (0.5.0.3-mswin) 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> Sat, 24 Jan 2015 7:40:00 -0500 -- 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 0.5.0.3-mswin in repository pyhoca-gui. commit ab6a7dc50a5466d65a4877cf22a11607ad400190 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Jan 24 08:37:48 2015 -0500 Windows: Include all fonts in NSIS installer, make them optional, and install only "misc" by default. (Fixes: #108) --- debian/changelog | 4 +++ nsis_template.py | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 16143b5..d9b7526 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ 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) + - Windows: Install VcXsrv "misc" fonts by default, and make all 4 font + groups optional: misc, 75dpi, 100dpi and others (Fixes: #108) + Note: The fact that all the fonts are included makes the installer about + 30MB larger. - 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: diff --git a/nsis_template.py b/nsis_template.py index 64687ea..72326c6 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -243,8 +243,14 @@ FunctionEnd ;-------------------------------- ;-------------------------------- +;Installer Sections -; The stuff to install +;"Recommended" is the default because it is specified 1st. +InstType "Recommended" +InstType "Full" +InstType "Minimal" + +; The application and all its required dependencies Section "{program_name} ($REQUIRED)" SectionIn RO @@ -253,7 +259,10 @@ Section "{program_name} ($REQUIRED)" ; Empty $INSTDIR before writing new files to it. RmDir /r "$INSTDIR\\*.*" ; Install new files... - File /r /x .svn /x .git "${{distOutputDirectory}}\\*.*" + ; Due to a limitation of nsis, we cannot tell it to exclude vcxsrv\\fonts + ; specifically. Instead, we must tell it to match every folder named + ; "fonts" (of which there is only one.) + File /r /x .svn /x .git /x fonts "${{distOutputDirectory}}\\*.*" ; Write the installation path into the registry WriteRegStr HKLM SOFTWARE\\{program_name} "Install_Dir" "$INSTDIR" @@ -275,9 +284,66 @@ Section "{program_name} ($REQUIRED)" SectionEnd +SectionGroup "Fonts" + + ;Empirical testing shows that "misc" fixes compatibility for the majority + ;of applications with font compatibility programs. + ;So lets make "misc" be part of "recommended", and therefore the default. + ; + ;As of VcXsrv-xp 1.14.3.2 + ;misc is 412 files at 6.80 MB (7.94 MB on disk) + Section "misc" fonts-misc + ; SectionIn Recommended & Full + SectionIn 1 2 + SetOutPath "$INSTDIR\\vcxsrv\\fonts\\" + File "${{distOutputDirectory}}\\vcxsrv\\fonts\\fonts.conf" + File /r "${{distOutputDirectory}}\\vcxsrv\\fonts\\misc" + SectionEnd + + ;As of VcXsrv-xp 1.14.3.2 + ;75dpi is 1,897 files at 10.7 MB (15.6 MB on disk) + Section "75dpi" fonts-75dpi + ; SectionIn Full + SectionIn 2 + SetOutPath "$INSTDIR\\vcxsrv\\fonts\\" + File "${{distOutputDirectory}}\\vcxsrv\\fonts\\fonts.conf" + File /r "${{distOutputDirectory}}\\vcxsrv\\fonts\\75dpi" + SectionEnd + + ;As of VcXsrv-xp 1.14.3.2 + ;100dpi is 1,897 files at 12.3 MB (16.8 MB on disk) + Section "100dpi" fonts-100dpi + ; SectionIn Full + SectionIn 2 + SetOutPath "$INSTDIR\\vcxsrv\\fonts\\" + File "${{distOutputDirectory}}\\vcxsrv\\fonts\\fonts.conf" + File /r "${{distOutputDirectory}}\\vcxsrv\\fonts\\100dpi" + SectionEnd + + ;As of VcXsrv-xp 1.14.3.2 + ;everything else is 466 files at 12.8MB (13.8 MB on disk) + Section "others" fonts-others + ; SectionIn Full + SectionIn 2 + SetOutPath "$INSTDIR\\vcxsrv\\fonts\\" + File "${{distOutputDirectory}}\\vcxsrv\\fonts\\fonts.conf" + File /r "${{distOutputDirectory}}\\vcxsrv\\fonts\\cyrillic" + File /r "${{distOutputDirectory}}\\vcxsrv\\fonts\\encodings" + File /r "${{distOutputDirectory}}\\vcxsrv\\fonts\\OTF" + File /r "${{distOutputDirectory}}\\vcxsrv\\fonts\\Speedo" + File /r "${{distOutputDirectory}}\\vcxsrv\\fonts\\terminus-font" + File /r "${{distOutputDirectory}}\\vcxsrv\\fonts\\TTF" + File /r "${{distOutputDirectory}}\\vcxsrv\\fonts\\Type1" + SectionEnd + +SectionGroupEnd + ; Optional section (can be disabled by the user) Section "$STARTMENU_LINKS" + ; SectionIn Recommended & Full + SectionIn 1 2 + SetOutPath "$INSTDIR" CreateDirectory "$SMPROGRAMS\\{program_name}" CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name}.lnk" "$INSTDIR\\{program_name}.exe" "--quiet --start-xserver --start-pulseaudio --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 @@ -292,6 +358,9 @@ SectionEnd ; Optional section (can be disabled by the user) Section "$DESKTOP_LINKS" + ; SectionIn Recommended & Full + SectionIn 1 2 + SetOutPath "$INSTDIR" CreateShortCut "$DESKTOP\\{program_name}.lnk" "$INSTDIR\\{program_name}.exe" "--quiet --start-xserver --start-pulseaudio --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 -- 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 0.5.0.3-mswin in repository pyhoca-gui. commit 16ed09d1be618be73d43ea7c33f8cb7269a421a9 Author: Mike DePaulo <mikedep333@gmail.com> Date: Sat Jan 24 11:05:09 2015 -0500 release 0.5.0.3-20150124 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d9b7526..031b157 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -pyhoca-gui (0.5.0.3-mswin) UNRELEASED; urgency=medium +pyhoca-gui (0.5.0.3-20150124) unstable; urgency=medium [ Mike DePaulo ] - * New upstream version (0.5.0.3-mswin): + * New upstream version (Windows Only) (0.5.0.3-20150124): - Fix win32 build (missing win32gui.pyd) (Fixes: #649) - Windows: Install VcXsrv "misc" fonts by default, and make all 4 font groups optional: misc, 75dpi, 100dpi and others (Fixes: #108) @@ -16,7 +16,7 @@ pyhoca-gui (0.5.0.3-mswin) UNRELEASED; urgency=medium latest versions as of 2014-06-09 to the latest versions as of 2014-10-18. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 24 Jan 2015 7:40:00 -0500 + -- Mike DePaulo <mikedep333@gmail.com> Sat, 24 Jan 2015 11:03:07 -0500 pyhoca-gui (0.5.0.3-0x2go1) unstable; urgency=medium -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org