[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-20-g07da408
by Werner Koch
cvs at cvs.gnupg.org
Wed Jul 3 18:26:24 CEST 2013
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 07da408479de3f1f67b366b8c27e9354b5eff6f9 (commit)
via c96b32f7626add47e1f0b7997ce6e807efc25673 (commit)
via 56f662abcd0a7458f47d282d00bb5c3cb9883b7b (commit)
from 58b3c54d61470bab2be7e6d41f2f0b3773eef72e (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 07da408479de3f1f67b366b8c27e9354b5eff6f9
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 3 17:54:37 2013 +0200
Add newer translation directories to the uninstaller.
diff --git a/src/uninst-gpg4win.nsi b/src/uninst-gpg4win.nsi
index d93d6b6..843f5b0 100644
--- a/src/uninst-gpg4win.nsi
+++ b/src/uninst-gpg4win.nsi
@@ -51,8 +51,12 @@ Section "-un.gpg4win"
RMDir "$INSTDIR\share\gpg4win"
# Remove the locale directories.
+ RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\ar"
RMDir "$INSTDIR\share\locale\be\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\be"
+ RMDir "$INSTDIR\share\locale\bg\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\bg"
RMDir "$INSTDIR\share\locale\ca\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\ca"
RMDir "$INSTDIR\share\locale\cs\LC_MESSAGES"
@@ -67,6 +71,8 @@ Section "-un.gpg4win"
RMDir "$INSTDIR\share\locale\en at boldquot"
RMDir "$INSTDIR\share\locale\en at quot\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\en at quot"
+ RMDir "$INSTDIR\share\locale\en_GB\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\en_GB"
RMDir "$INSTDIR\share\locale\eo\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\eo"
RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
@@ -91,10 +97,14 @@ Section "-un.gpg4win"
RMDir "$INSTDIR\share\locale\ja"
RMDir "$INSTDIR\share\locale\nb\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\nb"
+ RMDir "$INSTDIR\share\locale\nl\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\nl"
RMDir "$INSTDIR\share\locale\pl\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\pl"
RMDir "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\pt_BR"
+ RMDir "$INSTDIR\share\locale\pt_PT\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\pt_PT"
RMDir "$INSTDIR\share\locale\pt\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\pt"
RMDir "$INSTDIR\share\locale\ro\LC_MESSAGES"
@@ -109,6 +119,8 @@ Section "-un.gpg4win"
RMDir "$INSTDIR\share\locale\sr"
RMDir "$INSTDIR\share\locale\tr\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\tr"
+ RMDir "$INSTDIR\share\locale\uk\LC_MESSAGES"
+ RMDir "$INSTDIR\share\locale\uk"
RMDir "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
RMDir "$INSTDIR\share\locale\zh_CN"
RMDir "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
commit c96b32f7626add47e1f0b7997ce6e807efc25673
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 3 17:46:57 2013 +0200
Add lots or /REBOOTOK for better uninstaller experience.
diff --git a/src/uninst-atk.nsi b/src/uninst-atk.nsi
index 29d2ec2..1f87f7f 100644
--- a/src/uninst-atk.nsi
+++ b/src/uninst-atk.nsi
@@ -1,18 +1,18 @@
# uninst-atk.nsi - Installer snippet for atk. -*- coding: latin-1; -*-
# Copyright (C) 2005, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@@ -46,8 +46,6 @@ Section "-un.atk"
Delete "$INSTDIR\lib\locale\ru\LC_MESSAGES\atk10.mo"
RMDir "$INSTDIR\lib\locale\ru\LC_MESSAGES"
RMDir "$INSTDIR\lib\locale\ru"
- RMDir "$INSTDIR\lib\locale"
- RMDir "$INSTDIR\lib"
# Current stuff.
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\atk10.mo"
@@ -68,8 +66,8 @@ Section "-un.atk"
RMDir "$INSTDIR\share\locale"
RMDir "$INSTDIR\share"
- Delete "$INSTDIR\libatk-1.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libatk-1.0-0.dll"
+
!endif
- RMDir "$INSTDIR"
SectionEnd
diff --git a/src/uninst-cairo.nsi b/src/uninst-cairo.nsi
index fe33dac..08070b9 100644
--- a/src/uninst-cairo.nsi
+++ b/src/uninst-cairo.nsi
@@ -30,10 +30,9 @@ Section "-un.cairo"
Push "${gpg4win_pkg_cairo_src}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libcairo-2.dll"
- Delete "$INSTDIR\libcairo-gobject-2.dll"
- Delete "$INSTDIR\libcairo-script-interpreter-2.dll"
+ Delete /REBOOTOK "$INSTDIR\libcairo-2.dll"
+ Delete /REBOOTOK "$INSTDIR\libcairo-gobject-2.dll"
+ Delete /REBOOTOK "$INSTDIR\libcairo-script-interpreter-2.dll"
- RMDir "$INSTDIR"
!endif
SectionEnd
diff --git a/src/uninst-expat.nsi b/src/uninst-expat.nsi
index dcafa77..f203d8d 100644
--- a/src/uninst-expat.nsi
+++ b/src/uninst-expat.nsi
@@ -1,18 +1,18 @@
# uninst-expat.nsi - Installer snippet for expat. -*- coding: latin-1; -*-
# Copyright (C) 2007 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, MA 02110-1301,
@@ -30,7 +30,6 @@ Section "-un.expat"
Push "${gpg4win_pkg_expat_src}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libexpat-1.dll"
- RMDir "$INSTDIR"
+ Delete /REBOOTOK "$INSTDIR\libexpat-1.dll"
!endif
SectionEnd
diff --git a/src/uninst-fontconfig.nsi b/src/uninst-fontconfig.nsi
index e3465d8..c1b5a23 100644
--- a/src/uninst-fontconfig.nsi
+++ b/src/uninst-fontconfig.nsi
@@ -1,18 +1,18 @@
# uninst-fontconfig.nsi - Installer snippet for fontconfig. -*- coding: latin-1; -*-
# Copyright (C) 2007 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, MA 02110-1301,
@@ -30,11 +30,9 @@ Section "-un.fontconfig"
Push "${gpg4win_pkg_fontconfig_src}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libfontconfig-1.dll"
+ Delete /REBOOTOK "$INSTDIR\libfontconfig-1.dll"
Delete "$INSTDIR\etc\fonts\fonts.conf"
RMDir "$INSTDIR\etc\fonts"
- RMDir "$INSTDIR\etc"
- RMDir "$INSTDIR"
!endif
SectionEnd
diff --git a/src/uninst-freetype.nsi b/src/uninst-freetype.nsi
index 6a52d90..19bb778 100644
--- a/src/uninst-freetype.nsi
+++ b/src/uninst-freetype.nsi
@@ -1,18 +1,18 @@
# uninst-freetype.nsi - Installer snippet for freetype. -*- coding: latin-1; -*-
# Copyright (C) 2007 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, MA 02110-1301,
@@ -30,7 +30,6 @@ Section "-un.freetype"
Push "${gpg4win_pkg_freetype_src}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\freetype6.dll"
- RMDir "$INSTDIR"
+ Delete /REBOOTOK "$INSTDIR\freetype6.dll"
!endif
SectionEnd
diff --git a/src/uninst-gdk-pixbuf.nsi b/src/uninst-gdk-pixbuf.nsi
index f82484c..691f8c2 100644
--- a/src/uninst-gdk-pixbuf.nsi
+++ b/src/uninst-gdk-pixbuf.nsi
@@ -30,10 +30,9 @@ Section "-un.gdk_pixbuf"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
Delete "$INSTDIR\gdk-pixbuf-query-loaders.exe"
Delete "$INSTDIR\gdk-pixbuf-pixdata.exe"
- RMDir "$INSTDIR"
!endif
SectionEnd
diff --git a/src/uninst-gettext.nsi b/src/uninst-gettext.nsi
index 607bbcf..001d527 100644
--- a/src/uninst-gettext.nsi
+++ b/src/uninst-gettext.nsi
@@ -30,8 +30,8 @@ Section "-un.gettext"
Push "${gpg4win_pkg_gettext}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libintl-8.dll"
- Delete "$INSTDIR\intl.dll"
+ Delete /REBOOTOK "$INSTDIR\libintl-8.dll"
+ Delete /REBOOTOK "$INSTDIR\intl.dll"
!ifdef DEBUG
Delete "$INSTDIR\gettext.exe"
Delete "$INSTDIR\ngettext.exe"
diff --git a/src/uninst-glib.nsi b/src/uninst-glib.nsi
index 2c4de0b..8beabcf 100644
--- a/src/uninst-glib.nsi
+++ b/src/uninst-glib.nsi
@@ -55,11 +55,11 @@ Section "-un.glib"
Delete "$INSTDIR\gspawn-win32-helper-console.exe"
Delete "$INSTDIR\gspawn-win32-helper.exe"
- Delete "$INSTDIR\libglib-2.0-0.dll"
- Delete "$INSTDIR\libgmodule-2.0-0.dll"
- Delete "$INSTDIR\libgobject-2.0-0.dll"
- Delete "$INSTDIR\libgthread-2.0-0.dll"
- Delete "$INSTDIR\libgio-2.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libglib-2.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libgmodule-2.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libgobject-2.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libgthread-2.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libgio-2.0-0.dll"
!endif
SectionEnd
diff --git a/src/uninst-gnupg2.nsi b/src/uninst-gnupg2.nsi
index bbfcdde..0242192 100644
--- a/src/uninst-gnupg2.nsi
+++ b/src/uninst-gnupg2.nsi
@@ -42,8 +42,8 @@ Section "-un.gnupg"
Delete "$INSTDIR\gpg2.exe"
Delete "$INSTDIR\gpgv2.exe"
Delete "$INSTDIR\gpgsm.exe"
- Delete "$INSTDIR\gpg-agent.exe"
- Delete "$INSTDIR\scdaemon.exe"
+ Delete /REBOOTOK "$INSTDIR\gpg-agent.exe"
+ Delete /REBOOTOK "$INSTDIR\scdaemon.exe"
Delete "$INSTDIR\gpgconf.exe"
Delete "$INSTDIR\gpg-connect-agent.exe"
Delete "$INSTDIR\gpgsplit.exe"
@@ -55,7 +55,6 @@ Section "-un.gnupg"
Delete "$INSTDIR\pub\gpgsm.exe"
Delete "$INSTDIR\pub\gpg-connect-agent.exe"
Delete "$INSTDIR\pub\gpgconf.exe"
- RMDir "$INSTDIR\pub"
Delete "$INSTDIR\gpg2keys_finger.exe"
Delete "$INSTDIR\gpg2keys_hkp.exe"
diff --git a/src/uninst-gpa.nsi b/src/uninst-gpa.nsi
index a4ff77b..e80ec85 100644
--- a/src/uninst-gpa.nsi
+++ b/src/uninst-gpa.nsi
@@ -30,9 +30,8 @@ Section "-un.gpa"
Push "${gpg4win_pkg_gpa}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\gpa.exe"
- Delete "$INSTDIR\pub\gpa.exe"
- RMDir "$INSTDIR\pub"
+ Delete /REBOOTOK "$INSTDIR\gpa.exe"
+ Delete /REBOOTOK "$INSTDIR\pub\gpa.exe"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gpa.mo"
Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gpa.mo"
diff --git a/src/uninst-gpgme.nsi b/src/uninst-gpgme.nsi
index 800cfc2..b650b4c 100644
--- a/src/uninst-gpgme.nsi
+++ b/src/uninst-gpgme.nsi
@@ -30,9 +30,9 @@ Section "-un.gpgme"
Push "${gpg4win_pkg_gpgme}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libgpgme-11.dll"
- Delete "$INSTDIR\libgpgme-glib-11.dll"
- Delete "$INSTDIR\libgpgme-qt-11.dll"
+ Delete /REBOOTOK "$INSTDIR\libgpgme-11.dll"
+ Delete /REBOOTOK "$INSTDIR\libgpgme-glib-11.dll"
+ Delete /REBOOTOK "$INSTDIR\libgpgme-qt-11.dll"
Delete "$INSTDIR\gpgme-w32spawn.exe"
Delete "$INSTDIR\lib\libgpgme.imp"
Delete "$INSTDIR\lib\libgpgme-glib.imp"
diff --git a/src/uninst-gtk+.nsi b/src/uninst-gtk+.nsi
index e829ff0..eada865 100644
--- a/src/uninst-gtk+.nsi
+++ b/src/uninst-gtk+.nsi
@@ -31,10 +31,10 @@ Section "-un.gtk+"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libgdk-win32-2.0-0.dll"
- Delete "$INSTDIR\libgtk-win32-2.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libgdk-win32-2.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libgtk-win32-2.0-0.dll"
- Delete "$INSTDIR\libgailutil-18.dll"
+ Delete /REBOOTOK "$INSTDIR\libgailutil-18.dll"
Delete "$INSTDIR\gtk-query-immodules-2.0.exe"
Delete "$INSTDIR\gtk-update-icon-cache.exe.manifest"
@@ -47,25 +47,25 @@ Section "-un.gtk+"
RMDir "$INSTDIR\etc\gtk-2.0"
Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\*.dll"
- RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\loaders"
+ RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\loaders"
Delete "$INSTDIR\lib\gtk-2.0\2.10.0\loaders\*.dll"
- RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\loaders"
+ RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\loaders"
Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\*.dll"
- RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\immodules"
+ 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"
+ RMDir "$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"
+ RMDir "$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 "$INSTDIR\lib\gtk-2.0\2.4.0"
+ RMDir "$INSTDIR\lib\gtk-2.0\2.10.0"
- Delete "$INSTDIR\lib\gtk-2.0\modules\*.dll"
- RMDir "$INSTDIR\lib\gtk-2.0\modules"
+ Delete /REBOOTOK "$INSTDIR\lib\gtk-2.0\modules\*.dll"
+ RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0\modules"
- RMDir "$INSTDIR\lib\gtk-2.0"
+ RMDir /REBOOTOK "$INSTDIR\lib\gtk-2.0"
Delete "$INSTDIR\lib\locale\de\LC_MESSAGES\gtk20.mo"
Delete "$INSTDIR\lib\locale\de\LC_MESSAGES\gtk20-properties.mo"
diff --git a/src/uninst-libassuan.nsi b/src/uninst-libassuan.nsi
index 8f10b7d..aea64e0 100644
--- a/src/uninst-libassuan.nsi
+++ b/src/uninst-libassuan.nsi
@@ -31,7 +31,7 @@ Section "-un.libassuan"
Push "${gpg4win_pkg_libassuan}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libassuan-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libassuan-0.dll"
Delete "$INSTDIR\lib\libassuan.imp"
Delete "$INSTDIR\include\assuan.h"
diff --git a/src/uninst-libffi.nsi b/src/uninst-libffi.nsi
index b572090..5171e8b 100644
--- a/src/uninst-libffi.nsi
+++ b/src/uninst-libffi.nsi
@@ -30,7 +30,7 @@ Section "-un.libffi"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libffi-6.dll"
+ Delete /REBOOTOK "$INSTDIR\libffi-6.dll"
# Also delete any left-over old libffi version.
Delete "$INSTDIR\libffi-5.dll"
diff --git a/src/uninst-libgpg-error.nsi b/src/uninst-libgpg-error.nsi
index 0991d68..55a3993 100644
--- a/src/uninst-libgpg-error.nsi
+++ b/src/uninst-libgpg-error.nsi
@@ -30,7 +30,7 @@ Section "-un.libgpg-error"
Push "${gpg4win_pkg_libgpg_error}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libgpg-error-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libgpg-error-0.dll"
Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libgpg-error.mo"
Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\libgpg-error.mo"
diff --git a/src/uninst-libiconv.nsi b/src/uninst-libiconv.nsi
index 0e840c4..b8d97c2 100644
--- a/src/uninst-libiconv.nsi
+++ b/src/uninst-libiconv.nsi
@@ -30,9 +30,9 @@ Section "-un.libiconv"
Push "${gpg4win_pkg_libiconv}"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libiconv-2.dll"
- Delete "$INSTDIR\iconv.dll"
- Delete "$INSTDIR\pub\iconv.dll"
+ Delete /REBOOTOK "$INSTDIR\libiconv-2.dll"
+ Delete /REBOOTOK "$INSTDIR\iconv.dll"
+ Delete /REBOOTOK "$INSTDIR\pub\iconv.dll"
!ifdef DEBUG
Delete "$INSTDIR\charset.dll"
Delete "$INSTDIR\iconv.exe"
diff --git a/src/uninst-libpng.nsi b/src/uninst-libpng.nsi
index df2da8c..947fdbe 100644
--- a/src/uninst-libpng.nsi
+++ b/src/uninst-libpng.nsi
@@ -1,18 +1,18 @@
# uninst-libpng.nsi - Installer snippet for libpng. -*- 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
@@ -31,7 +31,7 @@ Section "-un.libpng"
Call un.SourceDelete
!else
- Delete "$INSTDIR\libpng14-14.dll"
+ Delete /REBOOTOK "$INSTDIR\libpng14-14.dll"
# Old versions:
Delete "$INSTDIR\libpng13.dll"
diff --git a/src/uninst-pango.nsi b/src/uninst-pango.nsi
index bf0c79e..416ea79 100644
--- a/src/uninst-pango.nsi
+++ b/src/uninst-pango.nsi
@@ -1,18 +1,18 @@
# uninst-pango.nsi - Installer snippet for pango. -*- 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,10 +30,10 @@ Section "-un.pango"
Call un.SourceDelete
!else
Delete "$INSTDIR\pango-querymodules.exe"
- Delete "$INSTDIR\libpango-1.0-0.dll"
- Delete "$INSTDIR\libpangoft2-1.0-0.dll"
- Delete "$INSTDIR\libpangowin32-1.0-0.dll"
- Delete "$INSTDIR\libpangocairo-1.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libpango-1.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libpangoft2-1.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libpangowin32-1.0-0.dll"
+ Delete /REBOOTOK "$INSTDIR\libpangocairo-1.0-0.dll"
Delete "$INSTDIR\etc\pango\pango.modules"
@@ -58,7 +58,6 @@ Section "-un.pango"
Delete "$INSTDIR\etc\pango\pango.aliases"
RMDir "$INSTDIR\etc\pango"
- RMDir "$INSTDIR\etc"
- RMDir "$INSTDIR"
+
!endif
SectionEnd
commit 56f662abcd0a7458f47d282d00bb5c3cb9883b7b
Author: Werner Koch <wk at gnupg.org>
Date: Wed Jul 3 17:46:23 2013 +0200
Install libiconv-8 also as iconv.dll.
* src/inst-gettext.nsi: Install also as iconv.dll.
diff --git a/src/inst-gettext.nsi b/src/inst-gettext.nsi
index bc5f36e..975345a 100644
--- a/src/inst-gettext.nsi
+++ b/src/inst-gettext.nsi
@@ -33,6 +33,7 @@ Section "-gettext" SEC_gettext
File ${gpg4win_pkg_gettext}
!else
File ${prefix}/bin/libintl-8.dll
+ File /oname=intl.dll ${prefix}/bin/libintl-8.dll
!ifdef DEBUG
# We install a couple of binaries that may be useful for testing.
-----------------------------------------------------------------------
Summary of changes:
src/inst-gettext.nsi | 1 +
src/uninst-atk.nsi | 14 ++++++--------
src/uninst-cairo.nsi | 7 +++----
src/uninst-expat.nsi | 11 +++++------
src/uninst-fontconfig.nsi | 12 +++++-------
src/uninst-freetype.nsi | 11 +++++------
src/uninst-gdk-pixbuf.nsi | 3 +--
src/uninst-gettext.nsi | 4 ++--
src/uninst-glib.nsi | 10 +++++-----
src/uninst-gnupg2.nsi | 5 ++---
src/uninst-gpa.nsi | 5 ++---
src/uninst-gpg4win.nsi | 12 ++++++++++++
src/uninst-gpgme.nsi | 6 +++---
src/uninst-gtk+.nsi | 26 +++++++++++++-------------
src/uninst-libassuan.nsi | 2 +-
src/uninst-libffi.nsi | 2 +-
src/uninst-libgpg-error.nsi | 2 +-
src/uninst-libiconv.nsi | 6 +++---
src/uninst-libpng.nsi | 10 +++++-----
src/uninst-pango.nsi | 19 +++++++++----------
20 files changed, 85 insertions(+), 83 deletions(-)
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list