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

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-03-20 09:42:59 +0100 (Thu, 20 Mar 2008)
New Revision: 746

Modified:
   trunk/ChangeLog
   trunk/src/inst-gnupg.nsi
   trunk/src/inst-gnupg2.nsi
Log:
Do not install com-cert.pem.
Extend a comment note.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-19 18:12:30 UTC (rev 745)
+++ trunk/ChangeLog	2008-03-20 08:42:59 UTC (rev 746)
@@ -1,3 +1,7 @@
+2008-03-20  Werner Koch  <wk at g10code.com>
+
+	* src/inst-gnupg2.nsi: Do not install com-certs.pem.
+
 2008-03-19  Werner Koch  <wk at g10code.com>
 
 	* packages/packages.current: Update GpgOL.

Modified: trunk/src/inst-gnupg.nsi
===================================================================
--- trunk/src/inst-gnupg.nsi	2008-03-19 18:12:30 UTC (rev 745)
+++ trunk/src/inst-gnupg.nsi	2008-03-20 08:42:59 UTC (rev 746)
@@ -80,7 +80,9 @@
   # applications.
   # Note: We don't use it anymore so that gpgme decides what gpg to use
   #       For the new gpg4win we actually use gpg2.exe.
-  #       To cope with old installations we actually remove this vale.
+  #       To cope with old installations we actually remove this value.
+  #       However we can only remove the HKLM version not those set by
+  #       the user under HKCU.
   #WriteRegStr HKLM "Software\GNU\GnuPG" "gpgProgram" "$INSTDIR\gpg.exe"
   DeleteRegValue HKLM "Software\GNU\GnuPG" "gpgProgram"
 

Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi	2008-03-19 18:12:30 UTC (rev 745)
+++ trunk/src/inst-gnupg2.nsi	2008-03-20 08:42:59 UTC (rev 746)
@@ -66,7 +66,9 @@
 
   SetOutPath "$INSTDIR\share\gnupg"
   File "${prefix}/share/gnupg/qualified.txt"
-  File "${prefix}/share/gnupg/com-certs.pem"
+  # Due to problems with kleoptra we currently do not install the
+  # common certificates anymore.
+  #File "${prefix}/share/gnupg/com-certs.pem"
   File "${prefix}/share/gnupg/gpg-conf.skel"
 
   SetOutPath "$INSTDIR\etc\gnupg"