[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.6-19-g7ab5154

[by Andre Heinecke]

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, master has been updated
       via  7ab51544723a8b9fee0eefb378a1bb6d41b67c8a (commit)
       via  ae561dcf710a412755f74c821a28266c243795c6 (commit)
      from  e4df7a2fee61cca8328c662411e7b54ce9e39ab2 (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 7ab51544723a8b9fee0eefb378a1bb6d41b67c8a
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Sep 23 16:41:02 2015 +0200

    Call gnupg uninstaller on uninstall
    
    * src/uninst-gnupg-w32.nsi: Call gnupg-uninstaller on uninstall.

diff --git a/src/uninst-gnupg-w32.nsi b/src/uninst-gnupg-w32.nsi
index c9adef2..c7cea5a 100644
--- a/src/uninst-gnupg-w32.nsi
+++ b/src/uninst-gnupg-w32.nsi
@@ -24,11 +24,20 @@
 
 
 # Uninstaller section.
-Section "un.gnupg_w32"
+Section  "un.gnupg_w32"
 !ifdef SOURCES
   Push "${gpg4win_pkg_gnupg_w32}"
   Call un.SourceDelete
 !else
-  # TODO: Read gnupg uninstaller from registry.
+  ReadRegStr $0 HKLM "Software\GnuPG" "Install Directory"
+  # It is possible that someone uninstalled gnupg without uninstalling
+  # gpg4win
+  StrCmp $0 "" gnupg_w32_not_installed
+  DetailPrint  "$(T_Uninstalling_GnuPG) ${gpg4win_pkg_gnupg_w32_version}"
+  ExecWait '"$0\gnupg-uninstall.exe" /S'
+gnupg_w32_not_installed:
 !endif
 SectionEnd
+
+LangString T_UnInstalling_GnuPG ${LANG_ENGLISH} \
+   "Uninstalling GnuPG"

commit ae561dcf710a412755f74c821a28266c243795c6
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Sep 23 16:40:33 2015 +0200

    Update gnupg to 2.1.8
    
    * packages/packages.current (gnupg-w32): Update to 2.1.8

diff --git a/NEWS b/NEWS
index 44a7c0e..3bdffb1 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ Noteworthy changes in version 3.0.0 (unreleased)
 ------------------------------------------------
 
 ~~~~~~~~~~~~~~~
-GnuPG:          2.1.7
+GnuPG:          2.1.8
 Kleopatra:      2.2.0-gitcf609810
 GPA:            0.9.7
 GpgOL:          1.2.1
diff --git a/packages/packages.current b/packages/packages.current
index aad7592..a3a772c 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -278,13 +278,13 @@ chk  23f7ea010983b869f765c36d169dec51c8296cff
 
 # last changed: 2015-08-20
 # by: ah
-name gnupg-w32-2.1.7-20150811-bin.exe
-file binary/gnupg-w32-2.1.7_20150811.exe
-chk  dfea3fa2499f64cac223c9329c9f017bc3da11a5
+name gnupg-w32-2.1.8-20150910-bin.exe
+file binary/gnupg-w32-2.1.8_20150910.exe
+chk  fb70068a7e77f28946c24ac29a508fb5f419ffeb
 
-name gnupg-w32-2.1.7-20150811-src.tar.xz
-file binary/gnupg-w32-2.1.7_20150811.tar.xz
-chk  20439f65b8d94ec79523c45ad72418670ca9d5eb
+name gnupg-w32-2.1.8-20150910-src.tar.xz
+file binary/gnupg-w32-2.1.8_20150910.tar.xz
+chk  504ec0f678a7a5eea144aed5a2d1691ce83e62ab
 
 # last changed: 2015-06-23
 # by: ah

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

Summary of changes:
 NEWS                      |  2 +-
 packages/packages.current | 12 ++++++------
 src/uninst-gnupg-w32.nsi  | 13 +++++++++++--
 3 files changed, 18 insertions(+), 9 deletions(-)


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