[X2Go-Commits] x2goclient.git - build-main (branch) updated: 4.0.1.1-52-g31b6e2a
X2Go dev team
git-admin at x2go.org
Tue Dec 17 15:43:34 CET 2013
The branch, build-main has been updated
via 31b6e2a55ac9328c96ae4f61f18a1a3f4dbf9b6b (commit)
from 84b2ded49fc781a684fb394a96ea95c73eff8b08 (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 | 4 ++++
nsis/x2goclient.nsi | 34 +++++++++++++++++++++++++++++++---
2 files changed, 35 insertions(+), 3 deletions(-)
mode change 100644 => 100755 nsis/x2goclient.nsi
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index df069a3..1900abf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,10 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
- Handle SSH host key changes more elegantly and allow user interaction
if such a host key change occurs. (Fixes: #241).
+ [ Michael DePaulo ]
+ * New upstream version (4.0.1.2):
+ - win32: Add uninstall information to Add/Remove Programs. (Fixes: #230).
+
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 11 Sep 2013 12:17:43 +0200
x2goclient (4.0.1.1-0~x2go1) unstable; urgency=low
diff --git a/nsis/x2goclient.nsi b/nsis/x2goclient.nsi
old mode 100644
new mode 100755
index 74db5b1..35571c2
--- a/nsis/x2goclient.nsi
+++ b/nsis/x2goclient.nsi
@@ -10,7 +10,7 @@
;General
RequestExecutionLevel admin
- !define VERSION "4.0.1.2-pre01"
+ !define VERSION "4.0.1.2-pre02"
Name "x2goclient-${VERSION}"
Caption "x2goclient-${VERSION}"
OutFile "x2goclient-${VERSION}-setup.exe"
@@ -50,6 +50,12 @@ SectionEnd
Var STARTMENU_FOLDER
Var MUI_TEMP
+
+ !define UNINSTALL_REGKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\x2goclient"
+ !define UNINSTALL_DISPLAYNAME "X2Go Client for Windows"
+ !define UNINSTALL_PUBLISHER "X2Go Project"
+ !define UNINSTALL_DISPLAYVERSION ${VERSION}
+ !define UNINSTALL_URL "http://www.x2go.org"
;--------------------------------
;Pages
@@ -109,8 +115,29 @@ Section "x2goclient" Section1
CreateShortCut "$DESKTOP\X2goClient.lnk" "$INSTDIR\x2goclient.exe"
!insertmacro MUI_STARTMENU_WRITE_END
+
+ ;Add uninstall information to Add/Remove Programs
+ ;http://nsis.sourceforge.net/Add_uninstall_information_to_Add/Remove_Programs
+ WriteRegStr HKLM ${UNINSTALL_REGKEY} "InstallLocation" "$INSTDIR"
+ WriteRegStr HKLM ${UNINSTALL_REGKEY} "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
+ WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayIcon" "$INSTDIR\x2goclient.exe"
+ WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayName" "${UNINSTALL_DISPLAYNAME}"
+ WriteRegStr HKLM ${UNINSTALL_REGKEY} "Publisher" "${UNINSTALL_PUBLISHER}"
+ WriteRegStr HKLM ${UNINSTALL_REGKEY} "DisplayVersion" "${UNINSTALL_DISPLAYVERSION}"
+ WriteRegStr HKLM ${UNINSTALL_REGKEY} "HelpLink" "${UNINSTALL_URL}"
+ WriteRegStr HKLM ${UNINSTALL_REGKEY} "URLInfoAbout" "${UNINSTALL_URL}"
+ WriteRegStr HKLM ${UNINSTALL_REGKEY} "URLUpdateInfo" "${UNINSTALL_URL}"
+ WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "NoModify" 1
+ WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "NoRepair" 1
+
SectionEnd
+Section EstimatedSize
+ ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+ IntFmt $0 "0x%08X" $0
+ WriteRegDWORD HKLM ${UNINSTALL_REGKEY} "EstimatedSize" "$0"
+SectionEnd
+
;-------------------------------------------
;Descriptions
@@ -152,8 +179,9 @@ Section "Uninstall"
startMenuDeleteLoopDone:
RMDir /r "$INSTDIR"
-
- DeleteRegKey HKLM "Software\x2goclient"
+
+ DeleteRegKey HKLM "Software\x2goclient"
+ DeleteRegKey HKLM "${UNINSTALL_REGKEY}"
SectionEnd
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).
More information about the x2go-commits
mailing list