[Gpg4win-commits] r968 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-10-21 12:09:36 +0200 (Tue, 21 Oct 2008)
New Revision: 968

Modified:
   trunk/ChangeLog
   trunk/src/installer-finish.nsi
Log:
2008-10-21  Marcus Brinkmann  <marcus at g10code.com>

	* src/installer-finish.nsi (no_quick_launch_uninstall): Remove
	startup menu documentation directory.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-21 09:54:03 UTC (rev 967)
+++ trunk/ChangeLog	2008-10-21 10:09:36 UTC (rev 968)
@@ -1,3 +1,8 @@
+2008-10-21  Marcus Brinkmann  <marcus at g10code.com>
+
+	* src/installer-finish.nsi (no_quick_launch_uninstall): Remove
+	startup menu documentation directory.
+
 2008-10-20  Marcus Brinkmann  <marcus at g10code.com>
 
 	* Makefile.am (EXTRA_DIST): Add gpgme-1.1.7/01-registry.patch.

Modified: trunk/src/installer-finish.nsi
===================================================================
--- trunk/src/installer-finish.nsi	2008-10-21 09:54:03 UTC (rev 967)
+++ trunk/src/installer-finish.nsi	2008-10-21 10:09:36 UTC (rev 968)
@@ -1,5 +1,5 @@
 # installer-finish.nsi - Installer for GPG4Win.      -*- coding: latin-1; -*-
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2008 g10 Code GmbH
 # 
 # This file is part of GPG4Win.
 # 
@@ -55,7 +55,7 @@
   StrCpy $MYTMP $R0
   Delete "$SMPROGRAMS\$MYTMP\*.lnk"
   Delete "$SMPROGRAMS\$MYTMP\$(DESC_Menu_manuals)\*.lnk"
-  Delete "$DESKTOP\$(DESC_Desktop_manuals)\$(DESC_Name_man_novice_de).lnk"
+  RMDir "$SMPROGRAMS\$MYTMP\$(DESC_Menu_manuals)"
 
   RMDir "$SMPROGRAMS\$MYTMP\$(DESC_Desktop_manuals)"
   StrCpy $MYTMP "$SMPROGRAMS\$MYTMP"
@@ -70,6 +70,7 @@
   DeleteRegValue HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" \
         "Start Menu Folder"
 
+
   # Delete Desktop links.
 !ifdef HAVE_PKG_WINPT
   Delete "$DESKTOP\WinPT.lnk"
@@ -146,7 +147,6 @@
 
 !endif
 
-
   Delete "$INSTDIR\${PACKAGE}-uninstall.exe"
   RMDir "$INSTDIR"