[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-183-g8b7efbc

[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  8b7efbc82de7b367a3c2097f982915bfad5f5d76 (commit)
      from  c10c62049842fb3b489facf75b19b7d2efa4602a (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 8b7efbc82de7b367a3c2097f982915bfad5f5d76
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon May 13 07:08:35 2013 +0000

    Install dbus config into /etc
    
        Configurations in /etc overwrite /etc/dbus-1 this is a
        problem when overwriting an old installation.
    
        * src/inst-dbus.nsi, src/uninst-dbus.nsi: Overwrite old config
        in /etc

diff --git a/src/inst-dbus.nsi b/src/inst-dbus.nsi
index eddcd2c..5096d56 100644
--- a/src/inst-dbus.nsi
+++ b/src/inst-dbus.nsi
@@ -64,7 +64,7 @@ Section "-dbus" SEC_dbus
       File /oname=libexpat.dll.tmp ${prefix}/bin/libexpat.dll
       Rename /REBOOTOK libexpat.dll.tmp libexpat.dll
 
-  SetOutPath "$INSTDIR\etc\dbus-1"
+  SetOutPath "$INSTDIR\etc"
   File ${prefix}/etc/dbus-1/session.conf
   File ${prefix}/etc/dbus-1/system.conf
 
diff --git a/src/uninst-dbus.nsi b/src/uninst-dbus.nsi
index c085699..29e12c5 100644
--- a/src/uninst-dbus.nsi
+++ b/src/uninst-dbus.nsi
@@ -43,9 +43,8 @@ Section "-un.dbus"
   Delete /REBOOTOK "$INSTDIR\libdbus-1.dll"
   Delete /REBOOTOK "$INSTDIR\libexpat.dll"
 
-  Delete "$INSTDIR\etc\dbus-1\session.conf"
-  Delete "$INSTDIR\etc\dbus-1\system.conf"
-  RMDir "$INSTDIR\etc\dbus-1"
+  Delete "$INSTDIR\etc\session.conf"
+  Delete "$INSTDIR\etc\system.conf"
   RMDir "$INSTDIR\etc"
 
   RMDir "$INSTDIR"

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

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


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