[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-145-g26fd510

[by Werner Koch]

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  26fd510d2aaa5fead2b9a428f3a73d1e650c6fba (commit)
      from  3d9fc53079b5fa54540eb89a4375e263719ed629 (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 26fd510d2aaa5fead2b9a428f3a73d1e650c6fba
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Apr 29 11:40:14 2013 +0200

    gnupg: Scdaemon is now in libexec.
    
    * src/inst-gnupg2.nsi: Install sdaemon from libexec.

diff --git a/src/inst-gnupg2.nsi b/src/inst-gnupg2.nsi
index d80928a..0f4c879 100644
--- a/src/inst-gnupg2.nsi
+++ b/src/inst-gnupg2.nsi
@@ -1,18 +1,18 @@
 # inst-gnupg2.nsi - Installer snippet for gnupg2.     -*- coding: latin-1; -*-
 # Copyright (C) 2007, 2008 g10 Code GmbH
-# 
+#
 # This file is part of Gpg4win.
-# 
+#
 # Gpg4win is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # Gpg4win is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
@@ -41,7 +41,7 @@ ${MementoSection} "GnuPG" SEC_gnupg2
   # it like we did with gpg.  It might be better to install this tool
   # into a subdirectory.
 
-  # If we are reinstalling, try to kill a possible running agent 
+  # If we are reinstalling, try to kill a possible running agent
   ifFileExists "$INSTDIR\gpg-connect-agent.exe"  0 no_gpg_connect_agent
     ExecWait '"$INSTDIR\gpg-connect-agent.exe" killagent /bye'
   no_gpg_connect_agent:
@@ -54,7 +54,7 @@ ${MementoSection} "GnuPG" SEC_gnupg2
       File /oname=gpg-agent.exe.tmp "${prefix}/bin/gpg-agent.exe"
       Rename /REBOOTOK gpg-agent.exe.tmp gpg-agent.exe
 
-  File "${prefix}/bin/scdaemon.exe"
+  File "${prefix}/libexec/scdaemon.exe"
   File "${prefix}/bin/gpgconf.exe"
   File "${prefix}/bin/gpg-connect-agent.exe"
 

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

Summary of changes:
 src/inst-gnupg2.nsi |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


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