[Gpg4win-commits] r1171 - in trunk: . packages src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2009-06-17 15:39:53 +0200 (Wed, 17 Jun 2009)
New Revision: 1171

Modified:
   trunk/ChangeLog
   trunk/packages/packages.current
   trunk/src/uninst-gpg4win.nsi
Log:
Update dirmngr.
try harder to remove a running scdaemon.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-06-17 10:56:57 UTC (rev 1170)
+++ trunk/ChangeLog	2009-06-17 13:39:53 UTC (rev 1171)
@@ -1,6 +1,6 @@
 2009-06-17  Werner Koch  <wk at g10code.com>
 
-	* packages/packages.current: Update GnuPG.
+	* packages/packages.current: Update GnuPG and Dirmngr.
 
 	* src/installer.nsi (PrintBetaWarning): Comment out.
 	(PrintNonAdminWarning): Do not call beta warning.

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2009-06-17 10:56:57 UTC (rev 1170)
+++ trunk/packages/packages.current	2009-06-17 13:39:53 UTC (rev 1171)
@@ -360,16 +360,16 @@
 chk  f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
 
 name gnupg2-2.0.12.tar.bz2
-file alpha/gnupg/gnupg-2.0.12.tar.bz2
+file gnupg/gnupg-2.0.12.tar.bz2
 chk  91856f917c13a1a12622ef39995eaf59c46f7502
 
+file dirmngr/dirmngr-1.0.3.tar.bz2
+chk  437d381c937b1f1d0699d1ed37cf50f14bfbcd32
 
+
 # (Snapshots)
 server ftp://ftp.g10code.com/g10code/scratch
 
-file dirmngr-1.0.3-svn310.tar.bz2
-chk  e3f6df819419f1bff8f707cff41220a556c0b272
-
 file gpgme-1.1.9-svn1373.tar.bz2
 chk  7e4406731ee4a2f9804d8a36f28ac38693edc3c1
 

Modified: trunk/src/uninst-gpg4win.nsi
===================================================================
--- trunk/src/uninst-gpg4win.nsi	2009-06-17 10:56:57 UTC (rev 1170)
+++ trunk/src/uninst-gpg4win.nsi	2009-06-17 13:39:53 UTC (rev 1171)
@@ -101,6 +101,10 @@
 
   RMDir "$INSTDIR\share\locale"
 
+  # Try again to remove teh scdaemon.  This is useful because scdaemon
+  # needs some time to stop after gpg-agent has been stopped.
+  Delete "$INSTDIR\scdaemon.exe"
+
   # Try to remove other top directories.
   RMDir "$INSTDIR\lib"
   RMDir "$INSTDIR\share"