[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.2.2-17-g25564ce

[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  25564ce5ba57780ee111595ad09a705ccd17650d (commit)
      from  e3fafc5ac830276ff5c38779f3ae70b6b3cb712e (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 25564ce5ba57780ee111595ad09a705ccd17650d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Nov 19 12:31:04 2014 +0100

    Fix charset.alias uninstallation package
    
        * uninst-glib.nsi: Remove charset.alias
        * uninst-libiconv.nsi: Add charset.alias
    
    --
        The file is installed by libiconv so it should be
        removed in the corresponding uninstall script.
        This fixes a leftover in vanilla installation.

diff --git a/src/uninst-glib.nsi b/src/uninst-glib.nsi
index 8beabcf..6f2f84f 100644
--- a/src/uninst-glib.nsi
+++ b/src/uninst-glib.nsi
@@ -40,8 +40,6 @@ Section "-un.glib"
   RMDir "$INSTDIR\share\glib-2.0\schemas"
   RMDir "$INSTDIR\share\glib-2.0"
 
-  Delete "$INSTDIR\lib\charset.alias"
-
   Delete "$INSTDIR\gspawn-win32-helper.exe"
   Delete "$INSTDIR\gspawn-win32-helper-console.exe"
   Delete "$INSTDIR\gdbus.exe"
diff --git a/src/uninst-libiconv.nsi b/src/uninst-libiconv.nsi
index b8d97c2..21b3e80 100644
--- a/src/uninst-libiconv.nsi
+++ b/src/uninst-libiconv.nsi
@@ -33,6 +33,8 @@ Section "-un.libiconv"
   Delete /REBOOTOK "$INSTDIR\libiconv-2.dll"
   Delete /REBOOTOK "$INSTDIR\iconv.dll"
   Delete /REBOOTOK "$INSTDIR\pub\iconv.dll"
+
+  Delete "$INSTDIR\lib\charset.alias"
 !ifdef DEBUG
   Delete "$INSTDIR\charset.dll"
   Delete "$INSTDIR\iconv.exe"

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

Summary of changes:
 src/uninst-glib.nsi     |    2 --
 src/uninst-libiconv.nsi |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)


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