2007-05-25 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Thu, 24 May 2007 23:38:39 +0000 (23:38 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Thu, 24 May 2007 23:38:39 +0000 (23:38 +0000)
* src/uninst-gnupg.nsi: Fix path of gpgkeys helper programs.
Remove pub directory.
* src/uninst-gtk+.nsi: Fix path of directory to be removed.

ChangeLog
src/uninst-gnupg.nsi
src/uninst-gtk+.nsi

index cd36402..054e2b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-25  Marcus Brinkmann  <marcus@g10code.de>
+
+       * src/uninst-gnupg.nsi: Fix path of gpgkeys helper programs.
+       Remove pub directory.
+       * src/uninst-gtk+.nsi: Fix path of directory to be removed.
+
 2007-05-24  Werner Koch  <wk@g10code.com>
 
        Released 1.1.0.
index a32581a..e87d588 100644 (file)
@@ -37,12 +37,13 @@ Section "-un.gnupg"
   Delete "$INSTDIR\pub\gpgsplit.exe"
   Delete "$INSTDIR\pub\gpgv.exe"
 
-  Delete "$INSTDIR\gpgkeys_finger.exe"
-  Delete "$INSTDIR\gpgkeys_hkp.exe"
-  Delete "$INSTDIR\gpgkeys_curl.exe"
-  Delete "$INSTDIR\gpgkeys_ldap.exe"
+  Delete "$INSTDIR\pub\gpgkeys_finger.exe"
+  Delete "$INSTDIR\pub\gpgkeys_hkp.exe"
+  Delete "$INSTDIR\pub\gpgkeys_curl.exe"
+  Delete "$INSTDIR\pub\gpgkeys_ldap.exe"
   # Old gpg versions come with a separate http keyserver helper.
-  Delete "$INSTDIR\gpgkeys_http.exe"
+  Delete "$INSTDIR\pub\gpgkeys_http.exe"
+  RMDir "$INSTDIR\pub"
 
   Delete "$INSTDIR\share\gnupg\options.skel"
   Delete "$INSTDIR\share\gnupg\FAQ"
index 3edcbd4..f082c47 100644 (file)
@@ -82,7 +82,7 @@ Section "-un.gtk+"
 
   Delete "$INSTDIR\share\themes\MS-Windows\gtk-2.0\gtkrc"
   RMDir "$INSTDIR\share\themes\MS-Windows\gtk-2.0"
-  RMDir "$INSTDIR\share\themes\MW-Windows"
+  RMDir "$INSTDIR\share\themes\MS-Windows"
 
   RMDir "$INSTDIR\share\themes"