[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-21-g6f84e04

[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  6f84e049747615fb72a035fed1868a16c172eb13 (commit)
      from  07da408479de3f1f67b366b8c27e9354b5eff6f9 (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 6f84e049747615fb72a035fed1868a16c172eb13
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 3 18:07:58 2013 +0200

    Add even more /REBOOTOK for the uninstaller.

diff --git a/src/uninst-gtk+.nsi b/src/uninst-gtk+.nsi
index eada865..4ba5ba0 100644
--- a/src/uninst-gtk+.nsi
+++ b/src/uninst-gtk+.nsi
@@ -53,14 +53,14 @@ Section "-un.gtk+"
 
   Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\*.dll"
   RMDir  "$INSTDIR\lib\gtk-2.0\2.4.0\immodules"
-  Delete "$INSTDIR\lib\gtk-2.0\2.10.0\immodules\*.dll"
-  RMDir  "$INSTDIR\lib\gtk-2.0\2.10.0\immodules"
+  Delete /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\immodules\*.dll"
+  RMDir  /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\immodules"
 
-  Delete "$INSTDIR\lib\gtk-2.0\2.10.0\engines\*.dll"
-  RMDir  "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
+  Delete /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\engines\*.dll"
+  RMDir  /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0\engines"
 
   RMDir  "$INSTDIR\lib\gtk-2.0\2.4.0"
-  RMDir  "$INSTDIR\lib\gtk-2.0\2.10.0"
+  RMDir  /REBOOTOK "$INSTDIR\lib\gtk-2.0\2.10.0"
 
   Delete /REBOOTOK "$INSTDIR\lib\gtk-2.0\modules\*.dll"
   RMDir  /REBOOTOK "$INSTDIR\lib\gtk-2.0\modules"
diff --git a/src/uninst-zlib.nsi b/src/uninst-zlib.nsi
index dd2f44b..b348619 100644
--- a/src/uninst-zlib.nsi
+++ b/src/uninst-zlib.nsi
@@ -1,18 +1,18 @@
 # uninst-zlib.nsi - Installer snippet for zlib.    -*- coding: latin-1; -*-
 # Copyright (C) 2005 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@@ -30,7 +30,7 @@ Section "-un.zlib"
   Push "${gpg4win_pkg_zlib}"
   Call un.SourceDelete
 !else
-  Delete "$INSTDIR\zlib1.dll"
-  RMDir "$INSTDIR"
+  Delete /REBOOTOK "$INSTDIR\zlib1.dll"
+
 !endif
 SectionEnd

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

Summary of changes:
 src/uninst-gtk+.nsi |   10 +++++-----
 src/uninst-zlib.nsi |   12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)


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