[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.0-186-gbef339a

by Werner Koch cvs at cvs.gnupg.org
Mon May 13 15:34:18 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  bef339a2e57bdf9bcd40ce03ccaece167a239b75 (commit)
      from  e92dd8e50ffd2e097a523f1e6bd25f2d3f16a8b3 (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 bef339a2e57bdf9bcd40ce03ccaece167a239b75
Author: Werner Koch <wk at gnupg.org>
Date:   Fri May 10 13:14:01 2013 +0200

    Add leftover files to the uninstaller.
    
    --
    
    Also removed superfluous RMDir commands.

diff --git a/src/uninst-claws-mail.nsi b/src/uninst-claws-mail.nsi
index 17aa403..7fbff76 100644
--- a/src/uninst-claws-mail.nsi
+++ b/src/uninst-claws-mail.nsi
@@ -64,73 +64,29 @@ Section "-un.claws-mail"
   RMDir "$INSTDIR\share"
 
   Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\pt_BR"
   Delete "$INSTDIR\share\locale\uk\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\uk\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\uk"
   Delete "$INSTDIR\share\locale\bg\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\bg\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\bg"
   Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\pl\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\pl"
   Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\ja\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\ja"
   Delete "$INSTDIR\share\locale\pt_PT\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\pt_PT\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\pt_PT"
   Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\fi\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\fi"
   Delete "$INSTDIR\share\locale\it\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\it\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\it"
   Delete "$INSTDIR\share\locale\es\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\es\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\es"
   Delete "$INSTDIR\share\locale\id\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\id\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\id"
   Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\zh_CN"
   Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\nl\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\nl"
   Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\cs\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\cs"
   Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\ru\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\ru"
   Delete "$INSTDIR\share\locale\sv\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\sv\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\sv"
   Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\sk\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\sk"
   Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\ca\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\ca"
   Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\hu\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\hu"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\de\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\de"
   Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\fr\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\fr"
   Delete "$INSTDIR\share\locale\en_GB\LC_MESSAGES\claws-mail.mo"
-  RMDir  "$INSTDIR\share\locale\en_GB\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\en_GB"
-  RMDir  "$INSTDIR\share\locale"
 
   RMDir "$INSTDIR\share\claws-mail"
-  RMDir "$INSTDIR\share"
-  RMDir "$INSTDIR"
+
   DeleteRegKey HKLM "SOFTWARE\Clients\Mail\Claws Mail"
   DeleteRegKey HKLM "SOFTWARE\Classes\Claws-Mail.Url.mailto"
 
diff --git a/src/uninst-glib.nsi b/src/uninst-glib.nsi
index 7ca6ac2..2c4de0b 100644
--- a/src/uninst-glib.nsi
+++ b/src/uninst-glib.nsi
@@ -31,30 +31,16 @@ Section "-un.glib"
 !else
 
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\glib20.mo"
-  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\de"
   Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\glib20.mo"
-  RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\ar"
   Delete "$INSTDIR\share\locale\es\LC_MESSAGES\glib20.mo"
-  RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\es"
   Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\glib20.mo"
-  RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\fr"
   Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\glib20.mo"
-  RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\ru"
-  RMDir "$INSTDIR\share\locale"
 
   Delete "$INSTDIR\share\glib-2.0\schemas\gschema.dtd"
   RMDir "$INSTDIR\share\glib-2.0\schemas"
   RMDir "$INSTDIR\share\glib-2.0"
 
-  RMDir "$INSTDIR\share"
-
   Delete "$INSTDIR\lib\charset.alias"
-  RMDir "$INSTDIR\lib"
 
   Delete "$INSTDIR\gspawn-win32-helper.exe"
   Delete "$INSTDIR\gspawn-win32-helper-console.exe"
@@ -74,6 +60,6 @@ Section "-un.glib"
   Delete "$INSTDIR\libgobject-2.0-0.dll"
   Delete "$INSTDIR\libgthread-2.0-0.dll"
   Delete "$INSTDIR\libgio-2.0-0.dll"
-  RMDir "$INSTDIR"
+
 !endif
 SectionEnd
diff --git a/src/uninst-gnupg2.nsi b/src/uninst-gnupg2.nsi
index 4023f49..bbfcdde 100644
--- a/src/uninst-gnupg2.nsi
+++ b/src/uninst-gnupg2.nsi
@@ -1,18 +1,18 @@
 # uninst-gnupg2.nsi - Uninstaller snippet for gnupg2. -*- 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,
@@ -71,7 +71,6 @@ Section "-un.gnupg"
   Delete "$INSTDIR\share\gnupg\help.*.txt"
   Delete "$INSTDIR\share\gnupg\*.man"
   RMDir "$INSTDIR\share\gnupg"
-  RMDir "$INSTDIR\share"
 
 
   Delete "$INSTDIR\share\locale\be\LC_MESSAGES\gnupg2.mo"
diff --git a/src/uninst-gpa.nsi b/src/uninst-gpa.nsi
index 474e4cf..a4ff77b 100644
--- a/src/uninst-gpa.nsi
+++ b/src/uninst-gpa.nsi
@@ -1,18 +1,18 @@
 # uninst-gpa.nsi - Installer snippet for gpa.      -*- 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
@@ -35,29 +35,16 @@ Section "-un.gpa"
   RMDir "$INSTDIR\pub"
 
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gpa.mo"
-  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\de"
   Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gpa.mo"
-  RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\ar"
   Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gpa.mo"
-  RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\es"
   Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gpa.mo"
-  RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\fr"
   Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gpa.mo"
-  RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\ru"
-  RMDir "$INSTDIR\share\locale"
-
 
   Delete "$INSTDIR\share\gpa\gpa_tips.en"
   Delete "$INSTDIR\share\gpa\gpa_tips.de"
   Delete "$INSTDIR\share\gpa\gpa-logo.ppm"
   Delete "$INSTDIR\share\gpa\gpa.png"
   RMDir "$INSTDIR\share\gpa"
-  RMDir "$INSTDIR\share"
-  RMDir "$INSTDIR"
+
 !endif
 SectionEnd
diff --git a/src/uninst-gpg4win.nsi b/src/uninst-gpg4win.nsi
index 9982956..d93d6b6 100644
--- a/src/uninst-gpg4win.nsi
+++ b/src/uninst-gpg4win.nsi
@@ -83,6 +83,8 @@ Section "-un.gpg4win"
   RMDir "$INSTDIR\share\locale\hu"
   RMDir "$INSTDIR\share\locale\id\LC_MESSAGES"
   RMDir "$INSTDIR\share\locale\id"
+  RMDir "$INSTDIR\share\locale\id_ID\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\id_ID"
   RMDir "$INSTDIR\share\locale\it\LC_MESSAGES"
   RMDir "$INSTDIR\share\locale\it"
   RMDir "$INSTDIR\share\locale\ja\LC_MESSAGES"
@@ -103,6 +105,8 @@ Section "-un.gpg4win"
   RMDir "$INSTDIR\share\locale\sk"
   RMDir "$INSTDIR\share\locale\sv\LC_MESSAGES"
   RMDir "$INSTDIR\share\locale\sv"
+  RMDir "$INSTDIR\share\locale\sr\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sr"
   RMDir "$INSTDIR\share\locale\tr\LC_MESSAGES"
   RMDir "$INSTDIR\share\locale\tr"
   RMDir "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
@@ -112,7 +116,7 @@ Section "-un.gpg4win"
 
   RMDir "$INSTDIR\share\locale"
 
-  # Try again to remove teh scdaemon.  This is useful because scdaemon
+  # Try again to remove the scdaemon.  This is useful because scdaemon
   # needs some time to stop after gpg-agent has been stopped.
   Delete "$INSTDIR\scdaemon.exe"
 
@@ -121,6 +125,7 @@ Section "-un.gpg4win"
   RMDir "$INSTDIR\include"
   RMDir "$INSTDIR\share"
   RMDir "$INSTDIR\pub"
+  RMDir "$INSTDIR\etc"
   RMDir "$INSTDIR"
 
 !endif
diff --git a/src/uninst-gpgme.nsi b/src/uninst-gpgme.nsi
index f02e177..800cfc2 100644
--- a/src/uninst-gpgme.nsi
+++ b/src/uninst-gpgme.nsi
@@ -35,6 +35,7 @@ Section "-un.gpgme"
   Delete "$INSTDIR\libgpgme-qt-11.dll"
   Delete "$INSTDIR\gpgme-w32spawn.exe"
   Delete "$INSTDIR\lib\libgpgme.imp"
+  Delete "$INSTDIR\lib\libgpgme-glib.imp"
   Delete "$INSTDIR\include\gpgme.h"
 !endif
 SectionEnd
diff --git a/src/uninst-gtk+.nsi b/src/uninst-gtk+.nsi
index cd3ef61..e829ff0 100644
--- a/src/uninst-gtk+.nsi
+++ b/src/uninst-gtk+.nsi
@@ -45,7 +45,6 @@ Section "-un.gtk+"
   Delete "$INSTDIR\etc\gtk-2.0\im-multipress.conf"
   Delete "$INSTDIR\etc\gtk-2.0\gtkrc"
   RMDir "$INSTDIR\etc\gtk-2.0"
-  RMDir "$INSTDIR\etc"
 
   Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\*.dll"
   RMDir "$INSTDIR\lib\gtk-2.0\2.10.0\loaders"
@@ -70,49 +69,25 @@ Section "-un.gtk+"
 
   Delete "$INSTDIR\lib\locale\de\LC_MESSAGES\gtk20.mo"
   Delete "$INSTDIR\lib\locale\de\LC_MESSAGES\gtk20-properties.mo"
-  RMDir "$INSTDIR\lib\locale\de\LC_MESSAGES"
-  RMDir "$INSTDIR\lib\locale\de"
   Delete "$INSTDIR\lib\locale\ar\LC_MESSAGES\gtk20.mo"
   Delete "$INSTDIR\lib\locale\ar\LC_MESSAGES\gtk20-properties.mo"
-  RMDir "$INSTDIR\lib\locale\ar\LC_MESSAGES"
-  RMDir "$INSTDIR\lib\locale\ar"
   Delete "$INSTDIR\lib\locale\es\LC_MESSAGES\gtk20.mo"
   Delete "$INSTDIR\lib\locale\es\LC_MESSAGES\gtk20-properties.mo"
-  RMDir "$INSTDIR\lib\locale\es\LC_MESSAGES"
-  RMDir "$INSTDIR\lib\locale\es"
   Delete "$INSTDIR\lib\locale\fr\LC_MESSAGES\gtk20.mo"
   Delete "$INSTDIR\lib\locale\fr\LC_MESSAGES\gtk20-properties.mo"
-  RMDir "$INSTDIR\lib\locale\fr\LC_MESSAGES"
-  RMDir "$INSTDIR\lib\locale\fr"
   Delete "$INSTDIR\lib\locale\ru\LC_MESSAGES\gtk20.mo"
   Delete "$INSTDIR\lib\locale\ru\LC_MESSAGES\gtk20-properties.mo"
-  RMDir "$INSTDIR\lib\locale\ru\LC_MESSAGES"
-  RMDir "$INSTDIR\lib\locale\ru"
-  RMDir "$INSTDIR\lib\locale"
-
-  RMDir "$INSTDIR\lib"
 
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gtk20.mo"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gtk20-properties.mo"
-  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\de"
   Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gtk20.mo"
   Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\gtk20-properties.mo"
-  RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\ar"
   Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gtk20.mo"
   Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gtk20-properties.mo"
-  RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\es"
   Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtk20.mo"
   Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtk20-properties.mo"
-  RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\fr"
   Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gtk20.mo"
   Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gtk20-properties.mo"
-  RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\ru"
-  RMDir "$INSTDIR\share\locale"
 
   Delete "$INSTDIR\share\themes\Default\gtk-2.0\gtkrc"
   RMDir "$INSTDIR\share\themes\Default\gtk-2.0"
@@ -134,8 +109,5 @@ Section "-un.gtk+"
 
   RMDir "$INSTDIR\share\themes"
 
-  RMDir "$INSTDIR\share"
-
-  RMDir "$INSTDIR"
 !endif
 SectionEnd
diff --git a/src/uninst-gtkhtml2_viewer.nsi b/src/uninst-gtkhtml2_viewer.nsi
index e0aee40..23f9d6f 100644
--- a/src/uninst-gtkhtml2_viewer.nsi
+++ b/src/uninst-gtkhtml2_viewer.nsi
@@ -1,18 +1,18 @@
 # uninst-gtkhtml2_viewer.nsi - Installer snippet for gtkhtml2_viewer.-*- coding: latin-1; -*-
 # Copyright (C) 2005, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@@ -32,61 +32,22 @@ Section "-un.gtkhtml2_viewer"
   Delete "$INSTDIR\lib\claws-mail\plugins\gtkhtml2_viewer.dll"
   RMDir "$INSTDIR\lib\claws-mail\plugins"
   RMDir "$INSTDIR\lib\claws-mail"
-  Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\pt_BR"
-  Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\pl\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\pl"
-  Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\ja\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\ja"
+  Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\gtkhtml2_viewer.mo"
+  Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\gtkhtml2_viewer.mo"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gtkhtml2_viewer.mo"
+  Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gtkhtml2_viewer.mo"
   Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\fi\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\fi"
+  Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtkhtml2_viewer.mo"
+  Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\gtkhtml2_viewer.mo"
+  Delete "$INSTDIR\share\locale\id_ID\LC_MESSAGES\gtkhtml2_viewer.mo"
   Delete "$INSTDIR\share\locale\it\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\it\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\it"
-  Delete "$INSTDIR\share\locale\es\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\es\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\es"
-  Delete "$INSTDIR\share\locale\id\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\id\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\id"
-  Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\zh_CN"
+  Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\gtkhtml2_viewer.mo"
   Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\nl\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\nl"
-  Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\cs\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\cs"
+  Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\gtkhtml2_viewer.mo"
+  Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\gtkhtml2_viewer.mo"
   Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\ru\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\ru"
   Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\sk\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\sk"
-  Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\ca\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\ca"
-  Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\hu\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\hu"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\de\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\de"
-  Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\fr\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\fr"
   Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\gtkhtml2_viewer.mo"
-  RMDir  "$INSTDIR\share\locale\sr\LC_MESSAGES"
-  RMDir  "$INSTDIR\share\locale\sr"
-  RMDir  "$INSTDIR\share\locale"
-  RMDir "$INSTDIR\share"
-  RMDir "$INSTDIR\lib"
-  RMDir "$INSTDIR"
-
+  Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\gtkhtml2_viewer.mo"
 !endif
 SectionEnd
diff --git a/src/uninst-libgpg-error.nsi b/src/uninst-libgpg-error.nsi
index 5b2cb38..0991d68 100644
--- a/src/uninst-libgpg-error.nsi
+++ b/src/uninst-libgpg-error.nsi
@@ -33,23 +33,14 @@ Section "-un.libgpg-error"
   Delete "$INSTDIR\libgpg-error-0.dll"
 
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libgpg-error.mo"
-  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\de"
   Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\libgpg-error.mo"
-  RMDir "$INSTDIR\share\locale\pl\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\pl"
   Delete "$INSTDIR\share\locale\ro\LC_MESSAGES\libgpg-error.mo"
-  RMDir "$INSTDIR\share\locale\ro\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\ro"
   Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\libgpg-error.mo"
-  RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\fr"
-  RMDir "$INSTDIR\share\locale"
-  RMDir "$INSTDIR\share"
+
   Delete "$INSTDIR\gpg-error.exe"
   Delete "$INSTDIR\lib\libgpg-error.imp"
+  Delete "$INSTDIR\lib\libgpg-assuan.imp"
   Delete "$INSTDIR\include\gpg-error.h"
 
-  RMDir "$INSTDIR"
 !endif
 SectionEnd

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

Summary of changes:
 src/uninst-claws-mail.nsi      |   46 +--------------------------
 src/uninst-glib.nsi            |   16 +---------
 src/uninst-gnupg2.nsi          |    9 ++---
 src/uninst-gpa.nsi             |   23 +++----------
 src/uninst-gpg4win.nsi         |    7 +++-
 src/uninst-gpgme.nsi           |    1 +
 src/uninst-gtk+.nsi            |   28 ----------------
 src/uninst-gtkhtml2_viewer.nsi |   69 +++++++++-------------------------------
 src/uninst-libgpg-error.nsi    |   13 +------
 9 files changed, 35 insertions(+), 177 deletions(-)


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



More information about the Gpg4win-commits mailing list