[Gpg4win-commits] r250 - in trunk: . doc packages src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2006-04-03 13:28:32 +0200 (Mon, 03 Apr 2006)
New Revision: 250

Modified:
   trunk/ChangeLog
   trunk/doc/ChangeLog
   trunk/packages/packages.current
   trunk/src/inst-gnupg.nsi
   trunk/src/uninst-gnupg.nsi
Log:
Prepare for using gnupg 1.4.3


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-04-01 13:29:41 UTC (rev 249)
+++ trunk/ChangeLog	2006-04-03 11:28:32 UTC (rev 250)
@@ -1,3 +1,8 @@
+2006-04-03  Werner Koch  <wk at g10code.com>
+
+	* src/inst-gnupg.nsi: Now that 1.4.3 has been released tehr eis no
+	more need trying to install the http keyserver helper.
+
 2006-04-01  Timo Schulz  <ts at g10code.com>
 
 	* src/inst-sections.nsi: WinPT desktop link now

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2006-04-01 13:29:41 UTC (rev 249)
+++ trunk/doc/ChangeLog	2006-04-03 11:28:32 UTC (rev 250)
@@ -1,3 +1,7 @@
+2006-03-31  Werner Koch  <wk at g10code.com>
+
+	* website/: Use http:// instead of ftp:// for all downloads.
+
 2006-03-30  Bernhard Reiter <bernhard at intevation.de>
 
 	Correcting website bugs. Thanks to Rodrigo Ristow Branco for reporting.

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2006-04-01 13:29:41 UTC (rev 249)
+++ trunk/packages/packages.current	2006-04-03 11:28:32 UTC (rev 250)
@@ -159,8 +159,8 @@
 
 server ftp://ftp.gnupg.org/gcrypt
 
-file alpha/gnupg/gnupg-1.4.3rc2.tar.bz2
-chk  eb5b839555ff1957b5956aaf4c96505223a2f9d0 
+file gnupg/gnupg-1.4.3.tar.bz2
+chk  9e96b36e4f4d1e8bc5028c99fac674482cbdb370
 
 file libgpg-error/libgpg-error-1.2.tar.bz2
 chk  468657e5bccd534f350b1a0109e19d2a9cc5d027

Modified: trunk/src/inst-gnupg.nsi
===================================================================
--- trunk/src/inst-gnupg.nsi	2006-04-01 13:29:41 UTC (rev 249)
+++ trunk/src/inst-gnupg.nsi	2006-04-03 11:28:32 UTC (rev 250)
@@ -40,8 +40,7 @@
   # gnupg/g10/keyserver.c::keyserver_spawn() for an explanation.
   File "${prefix}/libexec/gnupg/gpgkeys_finger.exe"
   File "${prefix}/libexec/gnupg/gpgkeys_hkp.exe"
-  File /nonfatal "${prefix}/libexec/gnupg/gpgkeys_http.exe"
-  File /nonfatal "${prefix}/libexec/gnupg/gpgkeys_curl.exe"
+  File "${prefix}/libexec/gnupg/gpgkeys_curl.exe"
   File "${prefix}/libexec/gnupg/gpgkeys_ldap.exe"
 
   SetOutPath "$INSTDIR\share\gnupg"

Modified: trunk/src/uninst-gnupg.nsi
===================================================================
--- trunk/src/uninst-gnupg.nsi	2006-04-01 13:29:41 UTC (rev 249)
+++ trunk/src/uninst-gnupg.nsi	2006-04-03 11:28:32 UTC (rev 250)
@@ -36,9 +36,10 @@
 
   Delete "$INSTDIR\gpgkeys_finger.exe"
   Delete "$INSTDIR\gpgkeys_hkp.exe"
-  Delete "$INSTDIR\gpgkeys_http.exe"
   Delete "$INSTDIR\gpgkeys_curl.exe"
   Delete "$INSTDIR\gpgkeys_ldap.exe"
+  # Old gpg versions come with a separate http keyserver helper.
+  Delete "$INSTDIR\gpgkeys_http.exe"
 
   Delete "$INSTDIR\share\gnupg\options.skel"
   Delete "$INSTDIR\share\gnupg\FAQ"