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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-05-25 01:38:39 +0200 (Fri, 25 May 2007)
New Revision: 410

Modified:
   trunk/ChangeLog
   trunk/src/uninst-gnupg.nsi
   trunk/src/uninst-gtk+.nsi
Log:
2007-05-25  Marcus Brinkmann  <marcus at 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.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-05-24 20:05:01 UTC (rev 409)
+++ trunk/ChangeLog	2007-05-24 23:38:39 UTC (rev 410)
@@ -1,3 +1,9 @@
+2007-05-25  Marcus Brinkmann  <marcus at 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 at g10code.com>
 
 	Released 1.1.0.

Modified: trunk/src/uninst-gnupg.nsi
===================================================================
--- trunk/src/uninst-gnupg.nsi	2007-05-24 20:05:01 UTC (rev 409)
+++ trunk/src/uninst-gnupg.nsi	2007-05-24 23:38:39 UTC (rev 410)
@@ -37,12 +37,13 @@
   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"

Modified: trunk/src/uninst-gtk+.nsi
===================================================================
--- trunk/src/uninst-gtk+.nsi	2007-05-24 20:05:01 UTC (rev 409)
+++ trunk/src/uninst-gtk+.nsi	2007-05-24 23:38:39 UTC (rev 410)
@@ -82,7 +82,7 @@
 
   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"