[Gpg4win-commits] [git] Gpg4win - branch, website, updated. gpg4win-2.1.0-204-gfd4bb1e

[by Emanuel Schuetze]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, website has been updated
       via  fd4bb1e6102165f53287ab6f46f94c80d2fc571a (commit)
       via  690936934530b3b469004337af2cda34e0f3aa2b (commit)
      from  a4a2b4462ca45a92a0a96db666904c1395123131 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fd4bb1e6102165f53287ab6f46f94c80d2fc571a
Merge: 6909369 a4a2b44
Author: Emanuel Schuetze <emanuel at intevation.de>
Date:   Wed Dec 17 09:27:35 2014 +0100

    Merge branch 'website' of git+ssh://playfair.gnupg.org/git/gpg4win into website


commit 690936934530b3b469004337af2cda34e0f3aa2b
Author: Emanuel Schuetze <emanuel at intevation.de>
Date:   Thu Sep 4 14:19:14 2014 +0200

    Removed 2.2.2 vanilla installer from download page.
    
    GnuTLS is missing. Added workaround: use light installler.

diff --git a/web/download-de.htm4 b/web/download-de.htm4
index cb7d1a8..2f7e3a4 100644
--- a/web/download-de.htm4
+++ b/web/download-de.htm4
@@ -82,6 +82,15 @@ kann hier herunter geladen werden:</p>
       SHA1 Prüfsumme: <code>SHA1_EXL</code></li>
 
     <li>Gpg4win <em>nur</em> mit GnuPG-Komponente:
+    <br>
+    <i>Achtung: Das Installationspaket Gpg4win-Vanilla 2.2.2 ist
+    leider nicht ganz vollständig. In der Paketierung fehlt GnuTLS
+    (wichtig für Keyserver-Support). Mit dem nächsten
+    Gpg4win-Release wird das behoben.
+    Bitte nutzen Sie bis dahin den Gpg4win-Light-Installer und
+    deaktivieren Sie alle optionalen Komponenten, um nur GnuPG zu
+    installieren.</i></li>
+<!--
       <div class="dlbutton2">
         <img src="img/dl_arrow.png" alt="" />
         <a href="VDOWNLOAD_URL">Gpg4win-Vanilla VERSION<br/>
@@ -90,6 +99,7 @@ kann hier herunter geladen werden:</p>
       <a href="http://files.gpg4win.org/gpg4win-vanilla-VERSION.exe.sig"
         >OpenPGP signatur</a><br>
         SHA1 Prüfsumme: <code>SHA1_EXV</code></li>
+-->
 
     <li>Gpg4win Quelltextpaket:
       <div class="dlbutton2">
diff --git a/web/download.htm4 b/web/download.htm4
index eea6c98..154c210 100644
--- a/web/download.htm4
+++ b/web/download.htm4
@@ -82,6 +82,14 @@ of Gpg4win VERSION here:</p>
       SHA1 checksum: <code>SHA1_EXL</code></li>
 
     <li>Gpg4win with GnuPG component <em>only</em>:
+    <br>
+    <i>Attention: The installation package Gpg4win-Vanilla 2.2.2 is
+    unfortunately not completely (GnuTLS is missing - important for
+    keyserver support). The next Gpg4win release resolves that.
+    Until then, please use the Gpg4win-Light installer and
+    uncheck all optional components to install GnuPG only.
+    </i></li>
+<!--
       <div class="dlbutton2">
         <img src="img/dl_arrow.png" alt="" />
         <a href="VDOWNLOAD_URL">Gpg4win-Vanilla VERSION<br/>
@@ -90,6 +98,7 @@ of Gpg4win VERSION here:</p>
       <a href="http://files.gpg4win.org/gpg4win-vanilla-VERSION.exe.sig"
         >OpenPGP signature</a><br>
         SHA1 checksum: <code>SHA1_EXV</code></li>
+-->
 
     <li>Gpg4win source code package:
       <div class="dlbutton2">

-----------------------------------------------------------------------

Summary of changes:
 web/download-de.htm4 |   10 ++++++++++
 web/download.htm4    |    9 +++++++++
 2 files changed, 19 insertions(+)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org