[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.1-22-ga68caf0

[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  a68caf0af94785a5adc5cee6e3faaa503c5b3ed0 (commit)
      from  333434dcf9f500ebd87f19a62dcc29b2d1097fb6 (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 a68caf0af94785a5adc5cee6e3faaa503c5b3ed0
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Aug 6 12:46:45 2014 +0000

    Update gcrypt nsis scripts
    
        * src/inst-libgcrypt.nsi, src/uninst-libgcrypt.nsi: Change
        dll name to libgcrypt-20.dll. No longer install gcrypt-module.h
    
    --
        Why do we install header files anyway?

diff --git a/src/inst-libgcrypt.nsi b/src/inst-libgcrypt.nsi
index ac875b5..a90ffbe 100644
--- a/src/inst-libgcrypt.nsi
+++ b/src/inst-libgcrypt.nsi
@@ -36,18 +36,17 @@ Section "-libgcrypt" SEC_libgcrypt
 !else
   ClearErrors
   SetOverwrite try
-  File "${prefix}/bin/libgcrypt-11.dll"
+  File "${prefix}/bin/libgcrypt-20.dll"
   SetOverwrite lastused
   ifErrors 0 +3
-      File /oname=libgcrypt-11.dll.tmp "${prefix}/bin/libgcrypt-11.dll"
-      Rename /REBOOTOK libgcrypt-11.dll.tmp libgcrypt-11.dll
+      File /oname=libgcrypt-20.dll.tmp "${prefix}/bin/libgcrypt-20.dll"
+      Rename /REBOOTOK libgcrypt-20.dll.tmp libgcrypt-20.dll
 
   SetOutPath "$INSTDIR\lib"
   File /oname=libgcrypt.imp "${prefix}/lib/libgcrypt.dll.a"
 
   SetOutPath "$INSTDIR\include"
   File "${prefix}/include/gcrypt.h"
-  File "${prefix}/include/gcrypt-module.h"
 
 
 !endif
diff --git a/src/uninst-libgcrypt.nsi b/src/uninst-libgcrypt.nsi
index 9a8830c..c208795 100644
--- a/src/uninst-libgcrypt.nsi
+++ b/src/uninst-libgcrypt.nsi
@@ -31,10 +31,9 @@ Section "-un.libgcrypt"
   Push "${gpg4win_pkg_libgcrypt}"
   Call un.SourceDelete
 !else
-  Delete "$INSTDIR\libgcrypt-11.dll"
+  Delete "$INSTDIR\libgcrypt-20.dll"
   Delete "$INSTDIR\lib\libgcrypt.imp"
   Delete "$INSTDIR\include\gcrypt.h"
-  Delete "$INSTDIR\include\gcrypt-module.h"
 
   RMDir "$INSTDIR"
 !endif

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

Summary of changes:
 src/inst-libgcrypt.nsi   |    7 +++----
 src/uninst-libgcrypt.nsi |    3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)


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