[Gpg4win-commits] r756 - in trunk: . doc doc/manual src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-03-25 10:43:53 +0100 (Tue, 25 Mar 2008)
New Revision: 756

Modified:
   trunk/ChangeLog
   trunk/doc/ChangeLog
   trunk/doc/manual/durchblicker.tex
   trunk/src/inst-dirmngr.nsi
   trunk/src/uninst-dirmngr.nsi
Log:
Mention keys.gnupg.net.
Create empry extra-certs directory.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-25 03:59:48 UTC (rev 755)
+++ trunk/ChangeLog	2008-03-25 09:43:53 UTC (rev 756)
@@ -1,3 +1,8 @@
+2008-03-25  Werner Koch  <wk at g10code.com>
+
+	* src/inst-dirmngr.nsi: Create empty extra-certs directory.
+	* src/uninst-dirmngr.nsi: Delete it.
+
 2008-03-25  Marcus Brinkmann  <marcus at g10code.de>
 
 	* packages/packages.current: Update w32pth.
@@ -23,7 +28,6 @@
 
 	* packages/packages.current: Update GpgOL.
 
->>>>>>> .r748
 2008-03-18  Marcus Brinkmann  <marcus at g10code.de>
 
 	* packages/packages.current: Update kleopatra and kdelibs.

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2008-03-25 03:59:48 UTC (rev 755)
+++ trunk/doc/ChangeLog	2008-03-25 09:43:53 UTC (rev 756)
@@ -1,3 +1,8 @@
+2008-03-25  Werner Koch  <wk at g10code.com>
+
+	* manual/durchblicker.tex (section{Die Schlüsselserver}): mention
+	keys.gnupg.net.
+
 2008-03-24  Jan-Oliver Wagner  <jan-oliver.wagner at intevation.de>
 
 	* README-BETA-de.txt: Comprehensive update for svn753.

Modified: trunk/doc/manual/durchblicker.tex
===================================================================
--- trunk/doc/manual/durchblicker.tex	2008-03-25 03:59:48 UTC (rev 755)
+++ trunk/doc/manual/durchblicker.tex	2008-03-25 09:43:53 UTC (rev 756)
@@ -785,7 +785,7 @@
 
 Die Keyserver unter den Adressen
 \begin{itemize}
-\item hkp://random.sks.keyserver.penguin.de
+\item hkp://keys.gnupg.net
 \item hkp://subkeys.pgp.net
 \end{itemize}
 sind ein Sammelpunkt für ein ganzes Netz dieser Server, es wird

Modified: trunk/src/inst-dirmngr.nsi
===================================================================
--- trunk/src/inst-dirmngr.nsi	2008-03-25 03:59:48 UTC (rev 755)
+++ trunk/src/inst-dirmngr.nsi	2008-03-25 09:43:53 UTC (rev 756)
@@ -41,6 +41,9 @@
   File "${prefix}/bin/dirmngr-client.exe"
   File "${prefix}/libexec/dirmngr_ldap.exe"
 
+  # Create a directory for extra certs for documentation reasons.
+  SetOutPath "$INSTDIR\lib\dirmngr\extra-certs"
+
   # Note: The make-msi.pl script ignores the following line, which is
   # ok, because the Windows installer does not override locally
   # modified files.

Modified: trunk/src/uninst-dirmngr.nsi
===================================================================
--- trunk/src/uninst-dirmngr.nsi	2008-03-25 03:59:48 UTC (rev 755)
+++ trunk/src/uninst-dirmngr.nsi	2008-03-25 09:43:53 UTC (rev 756)
@@ -41,6 +41,11 @@
   Delete "$INSTDIR\dirmngr_ldap.exe"
   RMDir "$INSTDIR\cache"
 
+  # Remove the extra-certs directory.  Obviously this works only if the
+  # user has not populated it.
+  RMDir "$INSTDIR\lib\dirmngr\extra-certs"
+  RMDir "$INSTDIR\lib\dirmngr"
+
   # Remove etc files.
 
   Delete "$INSTDIR\etc\dirmngr\dirmngr.conf"