The branch, build-baikal has been updated via e4a8fa5bfe6f5d326147f91af60588863cd2b19d (commit) from 5b6ece799d8afd3a1655de7b2f3a3b4a3292d2b5 (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 | 2 ++ nsis/x2goclient.nsi | 16 ++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 07eb618..68bfaa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low - Provide Keywords: key in .desktop file. - Add NSIS packaging files for win32 builds to source tree. (Files provided by Oleksandr Shneyder, thanks!!!). + - Rename win32 desktop and startmenu icon from "X2goClient" to "X2Go + Client". - Store broker HTTPS certificate exceptions in $HOME/.x2go/ssl/exceptions (before: $HOME/ssl/exceptions). (Fixes: #328). diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi index 35571c2..3014b76 100755 --- a/nsis/x2goclient.nsi +++ b/nsis/x2goclient.nsi @@ -109,10 +109,14 @@ Section "x2goclient" Section1 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER" CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe" - CreateShortCut "$INSTDIR\X2goClient.lnk" "$INSTDIR\x2goclient.exe" - CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\X2goClient.lnk" "$INSTDIR\x2goclient.exe" - CreateShortCut "$DESKTOP\X2goClient.lnk" "$INSTDIR\x2goclient.exe" - CreateShortCut "$DESKTOP\X2goClient.lnk" "$INSTDIR\x2goclient.exe" + CreateShortCut "$INSTDIR\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" + CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" + CreateShortCut "$DESKTOP\X2Go Client.lnk" "$INSTDIR\x2goclient.exe" + + ;Cleanup previous icon names (prior to X2Go Client 4.0.1.2) + Delete "$INSTDIR\X2goClient.lnk" + Delete "$SMPROGRAMS\$STARTMENU_FOLDER\X2goClient.lnk" + Delete "$DESKTOP\X2goClient.lnk" !insertmacro MUI_STARTMENU_WRITE_END @@ -167,8 +171,8 @@ Section "Uninstall" !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk" - Delete "$SMPROGRAMS\$MUI_TEMP\X2goClient.lnk" - Delete "$DESKTOP\X2goClient.lnk" + Delete "$SMPROGRAMS\$MUI_TEMP\X2Go Client.lnk" + Delete "$DESKTOP\X2Go Client.lnk" StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP" startMenuDeleteLoop: ClearErrors hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).