speedo: Add simple logos to the installer.

* build-aux/speedo/w32/README.txt: Include GnuPG Readme.
* build-aux/speedo/w32/gnupg-logo-150x57.bmp: New.
* build-aux/speedo/w32/gnupg-logo-164x314.bmp: New.
* build-aux/speedo/w32/inst.nsi: Add logos.
* build-aux/speedo.mk ($(bdir)/NEWS.tmp): Extract news items.
--

The welcome page logo is basically a placeholder until someone has
created a pretty one.

6 files changed, 39 insertions, 24 deletions

diff --git a/artwork/gnupg-lock-256x256tr.png b/artwork/gnupg-lock-256x256tr.png
new file mode 100644
index 000000000..25c565989
--- /dev/null
+++ b/artwork/gnupg-lock-256x256tr.png
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index f9490cb9b..005add722 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -1024,16 +1024,20 @@ dist-source: all
 	)
 
 
+# Extract the two latest news entries.  */
 $(bdir)/NEWS.tmp: $(topsrc)/NEWS
-	sed -e '/^#/d' <$(topsrc)/NEWS >$(bdir)/NEWS.tmp
+	awk '/^Notewo/ {if(okay>1){exit}; okay++};okay {print $0}' \
+	    <$(topsrc)/NEWS  >$(bdir)/NEWS.tmp
 
-$(bdir)/README.txt: $(bdir)/NEWS.tmp $(w32src)/README.txt \
+$(bdir)/README.txt: $(bdir)/NEWS.tmp $(topsrc)/README $(w32src)/README.txt \
                     $(w32src)/pkg-copyright.txt
 	sed -e '/^;.*/d;' \
-	-e '/!NEWSFILE!/{r NEWS.tmp' -e 'd;}' \
+	-e '/!NEWSFILE!/{r $(bdir)/NEWS.tmp' -e 'd;}' \
+	-e '/!GNUPGREADME!/{r $(topsrc)/README' -e 'd;}' \
         -e '/!PKG-COPYRIGHT!/{r $(w32src)/pkg-copyright.txt' -e 'd;}' \
         -e 's,!VERSION!,$(INST_VERSION),g' \
 	   < $(w32src)/README.txt \
+           | sed -e '/^#/d' \
            | awk '{printf "%s\r\n", $$0}' >$(bdir)/README.txt
 
 $(bdir)/g4wihelp.dll: $(w32src)/g4wihelp.c $(w32src)/exdll.h
diff --git a/build-aux/speedo/w32/README.txt b/build-aux/speedo/w32/README.txt
index 847ecd772..e98fb977f 100644
--- a/build-aux/speedo/w32/README.txt
+++ b/build-aux/speedo/w32/README.txt
@@ -1,5 +1,5 @@
 ;; README.txt                               -*- coding: latin-1; -*-
-;; This is the README installed with megacryption.  Lines with a
+;; This is the README installed for Windows.  Lines with a
 ;; semicolon in the first column are considered a comment and not
 ;; included in the actually installed version.  Certain keywords are
 ;; replaced by the Makefile; those words are enclosed by exclamation
@@ -14,27 +14,40 @@ Content:
 
      1. Important notes
      2. Changes
-     3. Legal notices
-
-
+     3. GnuPG README file
+     4. Legal notices
 
 
 1. Important Notes
 ==================
 
-HTML versions of the manuals have been installed on the desktop.
-Check out https://gnupg.org for latest news.
+See https://gnupg.org for latest news.  HowTo documents and manuals
+can be found there but some have also been installed on your machine.
 
+Developing GnuPG and keeping it in a healthy state is a full time job
+for at least two experienced developers.  We currently do not have the
+financial resources to even fully pay one person.  To change that
+please consider to donate at https://gnupg.org/donate/ .
 
-2. Record of Changes (NEWS file)
-================================
 
-Below you find the raw NEWS file:
+2. Record of Changes
+====================
+
+This is a list of changes to the GnuPG core for this and the previous
+release.
 
 !NEWSFILE!
 
 
-3. Legal notices pertaining to the individual packets
+3. GnuPG README file
+====================
+
+Below is the README file as distributed with the GnuPG source.
+
+!GNUPGREADME!
+
+
+4. Legal notices pertaining to the individual packets
 =====================================================
 
 GnuPG for Windows consist of several independent developed packages,
@@ -42,9 +55,9 @@ available under different license conditions.  Most of these packages
 are however available under the GNU General Public License (GNU GPL).
 Common to all is that they are free to use without restrictions, may
 be modified and that modifications may be distributed.  If the source
-file (i.e. gnupg-src-k.m.n.zip) is distributed along with the binaries
-and the use of the GNU GPL has been pointed out, distribution is in
-all cases possible.
+file (i.e. gnupg-w32-VERSION_DATE.tar.xz) is distributed along with
+the installer and the use of the GNU GPL has been pointed out,
+distribution is in all cases possible.
 
 What follows is a list of copyright statements.
 
diff --git a/build-aux/speedo/w32/gnupg-logo-150x57.bmp b/build-aux/speedo/w32/gnupg-logo-150x57.bmp
new file mode 100644
index 000000000..f2978f3dc
--- /dev/null
+++ b/build-aux/speedo/w32/gnupg-logo-150x57.bmp
diff --git a/build-aux/speedo/w32/gnupg-logo-164x314.bmp b/build-aux/speedo/w32/gnupg-logo-164x314.bmp
new file mode 100644
index 000000000..bf270ac70
--- /dev/null
+++ b/build-aux/speedo/w32/gnupg-logo-164x314.bmp
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 101e6d12e..8c6495384 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -132,11 +132,9 @@ VIAddVersionKey "FileVersion" "${PROD_VERSION}"
 !define MUI_FINISHPAGE_NOAUTOCLOSE
 !define MUI_UNFINISHPAGE_NOAUTOCLOSE
 
-#!define MUI_HEADERIMAGE
-#!define MUI_HEADERIMAGE_BITMAP \
-#               "${TOP_SRCDIR}/doc/logo/gnupg-logo-150x57.bmp"
-#!define MUI_WELCOMEFINISHPAGE_BITMAP \
-#               "${TOP_SRCDIR}/doc/logo/gnupg-logo-164x314.bmp"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "${W32_SRCDIR}\gnupg-logo-150x57.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "${W32_SRCDIR}\gnupg-logo-164x314.bmp"
 
 # Remember the installer language
 !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
@@ -218,11 +216,10 @@ Var STARTMENU_FOLDER
 !insertmacro MUI_RESERVEFILE_LANGDLL
 !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
 ReserveFile "${BUILD_DIR}\g4wihelp.dll"
-#ReserveFile "${TOP_SRCDIR}\doc\logo\gnupg-logo-400px.bmp"
-#ReserveFile "${W32_SRCDIR}\gnupg-splash.wav"
+ReserveFile "${W32_SRCDIR}\gnupg-logo-150x57.bmp"
+ReserveFile "${W32_SRCDIR}\gnupg-logo-164x314.bmp"
 ReserveFile "${TOP_SRCDIR}\COPYING"
 ReserveFile "${W32_SRCDIR}\inst-options.ini"
-#ReserveFile "${TOP_SRCDIR}\doc\logo\gnupg-logo-164x314.bmp"
 
 # Language support
 
@@ -1019,6 +1016,7 @@ Section "-un.gpgme"
   Delete "$INSTDIR\bin\libgpgme-glib-11.dll"
   Delete "$INSTDIR\bin\gpgme-w32spawn.exe"
   Delete "$INSTDIR\lib\libgpgme.imp"
+  Delete "$INSTDIR\lib\libgpgme-glib.imp"
   Delete "$INSTDIR\include\gpgme.h"
 SectionEnd