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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-10-16 17:18:02 +0200 (Tue, 16 Oct 2007)
New Revision: 567

Modified:
   trunk/ChangeLog
   trunk/src/inst-dirmngr.nsi
   trunk/src/uninst-dirmngr.nsi
Log:
2007-10-16  Marcus Brinkmann  <marcus at g10code.de>

	* src/uninst-dirmngr.nsi: Remove etc files.
	* src/inst-dirmngr.nsi: Do not use wildcard.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-16 15:07:09 UTC (rev 566)
+++ trunk/ChangeLog	2007-10-16 15:18:02 UTC (rev 567)
@@ -1,5 +1,8 @@
 2007-10-16  Marcus Brinkmann  <marcus at g10code.de>
 
+	* src/uninst-dirmngr.nsi: Remove etc files.
+	* src/inst-dirmngr.nsi: Do not use wildcard.
+
 	* src/uninst-qt.nsi: Uninstall qt.conf.
 
 	* src/uninst-qt.nsi: Uninstall mingwm10.dll.

Modified: trunk/src/inst-dirmngr.nsi
===================================================================
--- trunk/src/inst-dirmngr.nsi	2007-10-16 15:07:09 UTC (rev 566)
+++ trunk/src/inst-dirmngr.nsi	2007-10-16 15:18:02 UTC (rev 567)
@@ -49,7 +49,7 @@
 
    SetOutPath "$INSTDIR\etc\dirmngr\trusted-certs"
    File /nonfatal "${prefix}/share/doc/dirmngr/examples/trusted-certs/README"
-   File /nonfatal "${prefix}/share/doc/dirmngr/examples/trusted-certs/*.crt"
+   File /nonfatal "${prefix}/share/doc/dirmngr/examples/trusted-certs/bnetza-10r-ca.crt"
 
   dirmngr_no_conf:
 

Modified: trunk/src/uninst-dirmngr.nsi
===================================================================
--- trunk/src/uninst-dirmngr.nsi	2007-10-16 15:07:09 UTC (rev 566)
+++ trunk/src/uninst-dirmngr.nsi	2007-10-16 15:18:02 UTC (rev 567)
@@ -40,9 +40,18 @@
   Delete "$INSTDIR\dirmngr-client.exe"
   Delete "$INSTDIR\dirmngr_ldap.exe"
   RMDir "$INSTDIR\cache"
-  RMDir "$INSTDIR"
 
   # Remove etc files.
 
+  Delete "$INSTDIR\etc\dirmngr\dirmngr.conf"
+  Delete "$INSTDIR\etc\dirmngr\bnetza-10r-ocsp.signer"
+
+  Delete "$INSTDIR\etc\dirmngr\trusted-certs\README"
+  Delete "$INSTDIR\etc\dirmngr\trusted-certs\bnetza-10r-ca.crt"
+
+  RMDir "$INSTDIR\etc\dirmngr\trusted-certs"
+  RMDir "$INSTDIR\etc\dirmngr"
+  RMDir "$INSTDIR\etc"
+  RMDir "$INSTDIR"
 !endif
 SectionEnd