[Gpg4win-commits] r33 - in trunk: . src

marcus at wald.intevation.org marcus at wald.intevation.org
Sat Oct 22 14:00:20 CEST 2005


Author: marcus
Date: 2005-10-22 14:00:20 +0200 (Sat, 22 Oct 2005)
New Revision: 33

Added:
   trunk/src/uninst-atk.nsi
   trunk/src/uninst-gettext.nsi
   trunk/src/uninst-glib.nsi
   trunk/src/uninst-gnupg.nsi
   trunk/src/uninst-gpa.nsi
   trunk/src/uninst-gpgme.nsi
   trunk/src/uninst-gpgol.nsi
   trunk/src/uninst-gtk+.nsi
   trunk/src/uninst-libgpg-error.nsi
   trunk/src/uninst-libiconv.nsi
   trunk/src/uninst-libpng.nsi
   trunk/src/uninst-pango.nsi
   trunk/src/uninst-pkgconfig.nsi
   trunk/src/uninst-zlib.nsi
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/inst-atk.nsi
   trunk/src/inst-gettext.nsi
   trunk/src/inst-glib.nsi
   trunk/src/inst-gnupg.nsi
   trunk/src/inst-gpa.nsi
   trunk/src/inst-gpgme.nsi
   trunk/src/inst-gpgol.nsi
   trunk/src/inst-gtk+.nsi
   trunk/src/inst-libgpg-error.nsi
   trunk/src/inst-libiconv.nsi
   trunk/src/inst-libpng.nsi
   trunk/src/inst-pango.nsi
   trunk/src/inst-pkgconfig.nsi
   trunk/src/inst-sections.nsi
   trunk/src/inst-zlib.nsi
Log:
2005-10-22  Marcus Brinkmann  <marcus at g10code.de>

	* src/Makefile.am (common_nsi): Add uninstaller files.
	* src/uninst-atk.nsi, src/uninst-gettext.nsi, src/uninst-glib.nsi,
	src/uninst-gnupg.nsi, src/uninst-gpa.nsi, src/uninst-gpgme.nsi,
	src/uninst-gpgol.nsi, src/uninst-gtk+.nsi,
	src/uninst-libgpg-error.nsi, src/uninst-libiconv.nsi,
	src/uninst-libpng.nsi, src/uninst-pango.nsi,
	src/uninst-pkgconfig.nsi, src/uninst-zlib.nsi: New file.
	* src/inst-sections.nsi: Include the uninstallers in reverse
	order.
	* src/inst-gpgol.nsi: Register the gpgol DLL at installation, and
	(surprise!) unregister it at deinstallation.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/ChangeLog	2005-10-22 12:00:20 UTC (rev 33)
@@ -1,3 +1,17 @@
+2005-10-22  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/Makefile.am (common_nsi): Add uninstaller files.
+	* src/uninst-atk.nsi, src/uninst-gettext.nsi, src/uninst-glib.nsi,
+	src/uninst-gnupg.nsi, src/uninst-gpa.nsi, src/uninst-gpgme.nsi,
+	src/uninst-gpgol.nsi, src/uninst-gtk+.nsi,
+	src/uninst-libgpg-error.nsi, src/uninst-libiconv.nsi,
+	src/uninst-libpng.nsi, src/uninst-pango.nsi,
+	src/uninst-pkgconfig.nsi, src/uninst-zlib.nsi: New file.
+	* src/inst-sections.nsi: Include the uninstallers in reverse
+	order.
+	* src/inst-gpgol.nsi: Register the gpgol DLL at installation, and
+	(surprise!) unregister it at deinstallation.
+
 2005-10-21  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Enable static

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/Makefile.am	2005-10-22 12:00:20 UTC (rev 33)
@@ -100,8 +100,9 @@
 
 clean-local: clean-gpg4win
 
-common_nsi := inst-sections.nsi installer.nsi installer-finish.nsi \
-  $(addsuffix .nsi,$(addprefix inst-,$(gpg4win_build_list)))
+common_nsi := inst-sections.nsi installer.nsi installer-finish.nsi	\
+  $(addsuffix .nsi,$(addprefix inst-,$(gpg4win_build_list)))		\
+  $(addsuffix .nsi,$(addprefix uninst-,$(gpg4win_build_list)))
 
 gpg4win-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final
 	$(MAKENSIS) gpg4win.nsi

Modified: trunk/src/inst-atk.nsi
===================================================================
--- trunk/src/inst-atk.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-atk.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -35,15 +35,3 @@
   File ${prefix}/bin/libatk-1.0-0.dll
 !endif
 SectionEnd
-
-
-; Uninstaller section.
-Section "-un.atk"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_atk_src}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\libatk-1.0-0.dll"
-!endif
-  RMDir "$INSTDIR"
-SectionEnd

Modified: trunk/src/inst-gettext.nsi
===================================================================
--- trunk/src/inst-gettext.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-gettext.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -42,21 +42,3 @@
 !endif
 !endif
 SectionEnd
-
-
-; Uninstaller section.
-Section "-un.gettext"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_gettext_src}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\intl.dll"
-!ifdef DEBUG
-  Delete "$INSTDIR\gettext.exe"
-  Delete "$INSTDIR\ngettext.exe"
-  Delete "$INSTDIR\envsubst.exe"
-  Delete "$INSTDIR\asprintf.dll"
-!endif
-  RMDir "$INSTDIR"
-!endif
-SectionEnd

Modified: trunk/src/inst-glib.nsi
===================================================================
--- trunk/src/inst-glib.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-glib.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -38,19 +38,3 @@
   File ${prefix}/bin/libgthread-2.0-0.dll
 !endif
 SectionEnd
-
-
-; Uninstaller section.
-Section "-un.glib"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_glib_src}"
-  Call un.SourceDelete
-!else
-  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"
-  RMDir "$INSTDIR"
-!endif
-SectionEnd

Modified: trunk/src/inst-gnupg.nsi
===================================================================
--- trunk/src/inst-gnupg.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-gnupg.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -51,33 +51,6 @@
 SectionEnd
 
 
-; Uninstaller section.
-Section "-un.gnupg"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_gnupg}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\gpg.exe"
-  Delete "$INSTDIR\gpgsplit.exe"
-  Delete "$INSTDIR\gpgv.exe"
-
-  Delete "$INSTDIR\gpgkeys_finger.exe"
-  Delete "$INSTDIR\gpgkeys_hkp.exe"
-  Delete "$INSTDIR\gpgkeys_http.exe"
-  Delete "$INSTDIR\gpgkeys_ldap.exe"
-
-  Delete "$INSTDIR\share\gnupg\options.skel"
-  Delete "$INSTDIR\share\gnupg\FAQ"
-  Delete "$INSTDIR\share\gnupg\faq.html"
-  RMDir "$INSTDIR\share\gnupg"
-  RMDir "$INSTDIR\share"
-  RMDir "$INSTDIR"
-
-  DeleteRegValue HKLM "Software\GNU\GnuPG" "Install Directory"
-!endif
-SectionEnd
-
-
 LangString DESC_SEC_gnupg ${LANG_ENGLISH} \
    "GNU Privacy Guard"
 LangString DESC_SEC_gnupg ${LANG_GERMAN} \

Modified: trunk/src/inst-gpa.nsi
===================================================================
--- trunk/src/inst-gpa.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-gpa.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -40,25 +40,6 @@
 SectionEnd
 
 
-; Uninstaller section.
-Section "-un.gpa"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_gpa}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\gpa.exe"
-
-  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
-
-
 LangString DESC_SEC_gpa ${LANG_ENGLISH} \
    "GNU Privacy Assistant"
 LangString DESC_SEC_gpa ${LANG_GERMAN} \

Modified: trunk/src/inst-gpgme.nsi
===================================================================
--- trunk/src/inst-gpgme.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-gpgme.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -35,15 +35,3 @@
   File ${prefix}/bin/libgpgme-11.dll
 !endif
 SectionEnd
-
-
-; Uninstaller section.
-Section "-un.gpgme"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_gpgme}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\libgpgme-11.dll"
-  RMDir "$INSTDIR"
-!endif
-SectionEnd

Modified: trunk/src/inst-gpgol.nsi
===================================================================
--- trunk/src/inst-gpgol.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-gpgol.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -29,18 +29,9 @@
   File "${gpg4win_pkg_gpgol}"
 !else
   File ${prefix}/bin/gpgol.dll
-!endif
-SectionEnd
 
-
-; Uninstaller section.
-Section "-un.gpgol"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_gpgol}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\gpgol.dll"
-  RMDir "$INSTDIR"
+  # Register the DLL.
+  Exec 'regsvr32.exe /s "$INSTDIR\gpgol.dll"'
 !endif
 SectionEnd
 

Modified: trunk/src/inst-gtk+.nsi
===================================================================
--- trunk/src/inst-gtk+.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-gtk+.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -77,65 +77,3 @@
   File ${prefix}/share/themes/Emacs/gtk-2.0-key/gtkrc
 !endif
 SectionEnd
-
-
-; Uninstaller section.
-Section "-un.gtk+"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_gtk__src}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
-  Delete "$INSTDIR\libgdk-win32-2.0-0.dll"
-  Delete "$INSTDIR\libgtk-win32-2.0-0.dll"
-
-  Delete "$INSTDIR\etc\gtk-2.0\gdk-pixbuf.loaders"
-  Delete "$INSTDIR\etc\gtk-2.0\gtk.immodules"
-  RMDir "$INSTDIR\etc\gtk-2.0"
-  RMDir "$INSTDIR\etc"
-
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-ani.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-bmp.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-gif.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-ico.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-jpeg.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-pcx.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-png.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-pnm.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-ras.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-tga.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-tiff.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-wbmp.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-xbm.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-xpm.dll"
-  RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\loaders"
-
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-am-et.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-cedilla.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-cyrillic-translit.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ime.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-inuktitut.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ipa.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-thai-broken.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ti-er.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ti-et.dll"
-  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-viqr.dll"
-  RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\immodules"
-  RMDir "$INSTDIR\lib\gtk-2.0\2.4.0"
-  RMDir "$INSTDIR\lib\gtk-2.0"
-  RMDir "$INSTDIR\lib"
-
-  Delete "$INSTDIR\share\themes\Default\gtk-2.0\gtkrc"
-  RMDir "$INSTDIR\share\themes\Default\gtk-2.0"
-  Delete "$INSTDIR\share\themes\Default\gtk-2.0-key\gtkrc"
-  RMDir "$INSTDIR\share\themes\Default\gtk-2.0-key"
-  RMDir "$INSTDIR\share\themes\Default"
-
-  Delete "$INSTDIR\share\themes\Emacs\gtk-2.0-key\gtkrc"
-  RMDir "$INSTDIR\share\themes\Emacs\gtk-2.0-key"
-  RMDir "$INSTDIR\share\themes\Emacs"
-  RMDir "$INSTDIR\share\themes"
-  RMDir "$INSTDIR\share"
-  RMDir "$INSTDIR"
-!endif
-SectionEnd

Modified: trunk/src/inst-libgpg-error.nsi
===================================================================
--- trunk/src/inst-libgpg-error.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-libgpg-error.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -40,18 +40,3 @@
 !endif
 !endif
 SectionEnd
-
-
-; Uninstaller section.
-Section "-un.libgpg-error"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_libgpg_error}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\libgpg-error-0.dll"
-!ifdef DEBUG
-  Delete "$INSTDIR\gpg-error.exe"
-!endif
-  RMDir "$INSTDIR"
-!endif
-SectionEnd

Modified: trunk/src/inst-libiconv.nsi
===================================================================
--- trunk/src/inst-libiconv.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-libiconv.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -23,6 +23,7 @@
 !endif
 !define prefix ${ipdir}/libiconv-${gpg4win_pkg_libiconv_version}
 
+
 !ifdef DEBUG
 Section "libiconv" SEC_libiconv
 !else
@@ -40,18 +41,3 @@
 !endif
 !endif
 SectionEnd
-
-; Uninstaller section.
-Section "-un.libiconv"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_libiconv_src}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\iconv.dll"
-!ifdef DEBUG
-  Delete "$INSTDIR\charset.dll"
-  Delete "$INSTDIR\iconv.exe"
-!endif
-  RMDir "$INSTDIR"
-!endif
-SectionEnd

Modified: trunk/src/inst-libpng.nsi
===================================================================
--- trunk/src/inst-libpng.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-libpng.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -45,24 +45,3 @@
 !endif
 !endif
 SectionEnd
-
-
-; Uninstaller section.
-Section "-un.libpng"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_libpng_src}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\libpng13.dll"
-!ifdef DEBUG
-  Delete "$INSTDIR\png2pnm.exe"
-  Delete "$INSTDIR\pngtest.exe"
-  Delete "$INSTDIR\pnm2png.exe"
-  Delete "$INSTDIR\rpng-win.exe"
-  Delete "$INSTDIR\rpng2-win.exe"
-  Delete "$INSTDIR\VisualPng.exe"
-  Delete "$INSTDIR\wpng.exe"
-!endif
-  RMDir "$INSTDIR"
-!endif
-SectionEnd

Modified: trunk/src/inst-pango.nsi
===================================================================
--- trunk/src/inst-pango.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-pango.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -53,38 +53,3 @@
   File ${prefix}/lib/pango/1.4.0/modules/pango-tibetan-fc.dll
 !endif
 SectionEnd
-
-
-; Uninstaller section.
-Section "-un.pango"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_pango_src}"
-  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\etc\pango\pango.aliases"
-  Delete "$INSTDIR\etc\pango\pango.modules"
-  RMDir "$INSTDIR\etc\pango"
-  RMDir "$INSTDIR\etc"
-
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-arabic-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-basic-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-basic-win32.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-hangul-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-hebrew-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-indic-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-khmer-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-syriac-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-thai-fc.dll"
-  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-tibetan-fc.dll"
-  RMDir "$INSTDIR\lib\pango\1.4.0\modules"
-  RMDir "$INSTDIR\lib\pango\1.4.0"
-  RMDir "$INSTDIR\lib\pango"
-  RMDir "$INSTDIR\lib"
-  RMDir "$INSTDIR"
-!endif
-SectionEnd

Modified: trunk/src/inst-pkgconfig.nsi
===================================================================
--- trunk/src/inst-pkgconfig.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-pkgconfig.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -34,13 +34,3 @@
 !else
 !endif
 SectionEnd
-
-
-; Uninstaller section.
-Section "-un.pkgconfig"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_pkgconfig_src}"
-  Call un.SourceDelete
-!else
-!endif
-SectionEnd

Modified: trunk/src/inst-sections.nsi
===================================================================
--- trunk/src/inst-sections.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-sections.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -62,6 +62,51 @@
 !include "inst-gpa.nsi"
 !endif
 
+# We have to invoke the uninstallers in reverse order!
+
+!ifdef HAVE_PKG_GPA
+!include "uninst-gpa.nsi"
+!endif
+!ifdef HAVE_PKG_GTK_
+!include "uninst-gtk+.nsi"
+!endif
+!ifdef HAVE_PKG_ATK
+!include "uninst-atk.nsi"
+!endif
+!ifdef HAVE_PKG_PANGO
+!include "uninst-pango.nsi"
+!endif
+!ifdef HAVE_PKG_GPGOL
+!include "uninst-gpgol.nsi"
+!endif
+!ifdef HAVE_PKG_LIBPNG
+!include "uninst-libpng.nsi"
+!endif
+!ifdef HAVE_PKG_GLIB
+!include "uninst-glib.nsi"
+!endif
+!ifdef HAVE_PKG_GETTEXT
+!include "uninst-gettext.nsi"
+!endif
+!ifdef HAVE_PKG_GPGME
+!include "uninst-gpgme.nsi"
+!endif
+!ifdef HAVE_PKG_ZLIB
+!include "uninst-zlib.nsi"
+!endif
+!ifdef HAVE_PKG_PKGCONFIG
+!include "uninst-pkgconfig.nsi"
+!endif
+!ifdef HAVE_PKG_LIBICONV
+!include "uninst-libiconv.nsi"
+!endif
+!ifdef HAVE_PKG_LIBGPG_ERROR
+!include "uninst-libgpg-error.nsi"
+!endif
+!ifdef HAVE_PKG_GNUPG
+!include "uninst-gnupg.nsi"
+!endif
+
 # Dependency Management
 
 !include "Sections.nsh"

Modified: trunk/src/inst-zlib.nsi
===================================================================
--- trunk/src/inst-zlib.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/inst-zlib.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -35,15 +35,3 @@
   File ${prefix}/bin/zlib1.dll
 !endif
 SectionEnd
-
-
-; Uninstaller section.
-Section "-un.zlib"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_zlib_src}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\zlib1.dll"
-  RMDir "$INSTDIR"
-!endif
-SectionEnd

Added: trunk/src/uninst-atk.nsi
===================================================================
--- trunk/src/uninst-atk.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-atk.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,36 @@
+# uninst-atk.nsi - Installer snippet for atk.      -*- 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/atk-${gpg4win_pkg_atk_version}
+
+
+; Uninstaller section.
+Section "-un.atk"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_atk_src}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\libatk-1.0-0.dll"
+!endif
+  RMDir "$INSTDIR"
+SectionEnd

Added: trunk/src/uninst-gettext.nsi
===================================================================
--- trunk/src/uninst-gettext.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-gettext.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,42 @@
+# uninst-gettext.nsi - Installer snippet for gettext. -*- 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/gettext-${gpg4win_pkg_gettext_version}
+
+
+; Uninstaller section.
+Section "-un.gettext"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_gettext_src}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\intl.dll"
+!ifdef DEBUG
+  Delete "$INSTDIR\gettext.exe"
+  Delete "$INSTDIR\ngettext.exe"
+  Delete "$INSTDIR\envsubst.exe"
+  Delete "$INSTDIR\asprintf.dll"
+!endif
+  RMDir "$INSTDIR"
+!endif
+SectionEnd

Added: trunk/src/uninst-glib.nsi
===================================================================
--- trunk/src/uninst-glib.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-glib.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,39 @@
+# uninst-glib.nsi - Installer snippet for glib.      -*- 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
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/glib-${gpg4win_pkg_glib_version}
+
+
+; Uninstaller section.
+Section "-un.glib"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_glib_src}"
+  Call un.SourceDelete
+!else
+  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"
+  RMDir "$INSTDIR"
+!endif
+SectionEnd

Added: trunk/src/uninst-gnupg.nsi
===================================================================
--- trunk/src/uninst-gnupg.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-gnupg.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,51 @@
+# uninst-gnupg.nsi - Installer snippet for gnupg.   -*- 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/gnupg-${gpg4win_pkg_gnupg_version}
+
+
+; Uninstaller section.
+Section "-un.gnupg"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_gnupg}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\gpg.exe"
+  Delete "$INSTDIR\gpgsplit.exe"
+  Delete "$INSTDIR\gpgv.exe"
+
+  Delete "$INSTDIR\gpgkeys_finger.exe"
+  Delete "$INSTDIR\gpgkeys_hkp.exe"
+  Delete "$INSTDIR\gpgkeys_http.exe"
+  Delete "$INSTDIR\gpgkeys_ldap.exe"
+
+  Delete "$INSTDIR\share\gnupg\options.skel"
+  Delete "$INSTDIR\share\gnupg\FAQ"
+  Delete "$INSTDIR\share\gnupg\faq.html"
+  RMDir "$INSTDIR\share\gnupg"
+  RMDir "$INSTDIR\share"
+  RMDir "$INSTDIR"
+
+  DeleteRegValue HKLM "Software\GNU\GnuPG" "Install Directory"
+!endif
+SectionEnd

Added: trunk/src/uninst-gpa.nsi
===================================================================
--- trunk/src/uninst-gpa.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-gpa.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,43 @@
+# uninst-gpa.nsi - Installer snippet for gpa.      -*- 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/gpa-${gpg4win_pkg_gpa_version}
+
+
+; Uninstaller section.
+Section "-un.gpa"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_gpa}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\gpa.exe"
+
+  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

Added: trunk/src/uninst-gpgme.nsi
===================================================================
--- trunk/src/uninst-gpgme.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-gpgme.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,36 @@
+# uninst-gpgme.nsi - Installer snippet for gpgme.   -*- 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/gpgme-${gpg4win_pkg_gpgme_version}
+
+
+; Uninstaller section.
+Section "-un.gpgme"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_gpgme}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\libgpgme-11.dll"
+  RMDir "$INSTDIR"
+!endif
+SectionEnd

Added: trunk/src/uninst-gpgol.nsi
===================================================================
--- trunk/src/uninst-gpgol.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-gpgol.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,39 @@
+# uninst-gpgol.nsi - Installer snippet for gpgol.    -*- 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
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/gpgol-${gpg4win_pkg_gpgol_version}
+
+
+; Uninstaller section.
+Section "-un.gpgol"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_gpgol}"
+  Call un.SourceDelete
+!else
+
+  # Unregister the DLL
+  Exec 'regsvr32.exe /s /u "$INSTDIR\gpgol.dll"'
+
+  Delete "$INSTDIR\gpgol.dll"
+  RMDir "$INSTDIR"
+!endif
+SectionEnd

Added: trunk/src/uninst-gtk+.nsi
===================================================================
--- trunk/src/uninst-gtk+.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-gtk+.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,86 @@
+# uninst-gtk+.nsi - Installer snippet for gtk+.   -*- 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/gtk+-${gpg4win_pkg_gtk__version}
+
+
+; Uninstaller section.
+Section "-un.gtk+"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_gtk__src}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
+  Delete "$INSTDIR\libgdk-win32-2.0-0.dll"
+  Delete "$INSTDIR\libgtk-win32-2.0-0.dll"
+
+  Delete "$INSTDIR\etc\gtk-2.0\gdk-pixbuf.loaders"
+  Delete "$INSTDIR\etc\gtk-2.0\gtk.immodules"
+  RMDir "$INSTDIR\etc\gtk-2.0"
+  RMDir "$INSTDIR\etc"
+
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-ani.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-bmp.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-gif.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-ico.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-jpeg.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-pcx.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-png.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-pnm.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-ras.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-tga.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-tiff.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-wbmp.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-xbm.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\libpixbufloader-xpm.dll"
+  RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\loaders"
+
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-am-et.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-cedilla.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-cyrillic-translit.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ime.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-inuktitut.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ipa.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-thai-broken.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ti-er.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-ti-et.dll"
+  Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\im-viqr.dll"
+  RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\immodules"
+  RMDir "$INSTDIR\lib\gtk-2.0\2.4.0"
+  RMDir "$INSTDIR\lib\gtk-2.0"
+  RMDir "$INSTDIR\lib"
+
+  Delete "$INSTDIR\share\themes\Default\gtk-2.0\gtkrc"
+  RMDir "$INSTDIR\share\themes\Default\gtk-2.0"
+  Delete "$INSTDIR\share\themes\Default\gtk-2.0-key\gtkrc"
+  RMDir "$INSTDIR\share\themes\Default\gtk-2.0-key"
+  RMDir "$INSTDIR\share\themes\Default"
+
+  Delete "$INSTDIR\share\themes\Emacs\gtk-2.0-key\gtkrc"
+  RMDir "$INSTDIR\share\themes\Emacs\gtk-2.0-key"
+  RMDir "$INSTDIR\share\themes\Emacs"
+  RMDir "$INSTDIR\share\themes"
+  RMDir "$INSTDIR\share"
+  RMDir "$INSTDIR"
+!endif
+SectionEnd

Added: trunk/src/uninst-libgpg-error.nsi
===================================================================
--- trunk/src/uninst-libgpg-error.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-libgpg-error.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,39 @@
+# uninst-libgpg-error.nsi - Installer f. libgpg-error. -*- 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/libgpg-error-${gpg4win_pkg_libgpg_error_version}
+
+
+; Uninstaller section.
+Section "-un.libgpg-error"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_libgpg_error}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\libgpg-error-0.dll"
+!ifdef DEBUG
+  Delete "$INSTDIR\gpg-error.exe"
+!endif
+  RMDir "$INSTDIR"
+!endif
+SectionEnd

Added: trunk/src/uninst-libiconv.nsi
===================================================================
--- trunk/src/uninst-libiconv.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-libiconv.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,40 @@
+# uninst-libiconv.nsi - Installer snippet for libiconv.-*- 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/libiconv-${gpg4win_pkg_libiconv_version}
+
+
+; Uninstaller section.
+Section "-un.libiconv"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_libiconv_src}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\iconv.dll"
+!ifdef DEBUG
+  Delete "$INSTDIR\charset.dll"
+  Delete "$INSTDIR\iconv.exe"
+!endif
+  RMDir "$INSTDIR"
+!endif
+SectionEnd

Added: trunk/src/uninst-libpng.nsi
===================================================================
--- trunk/src/uninst-libpng.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-libpng.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,45 @@
+# 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/libpng-${gpg4win_pkg_libpng_version}
+
+
+; Uninstaller section.
+Section "-un.libpng"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_libpng_src}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\libpng13.dll"
+!ifdef DEBUG
+  Delete "$INSTDIR\png2pnm.exe"
+  Delete "$INSTDIR\pngtest.exe"
+  Delete "$INSTDIR\pnm2png.exe"
+  Delete "$INSTDIR\rpng-win.exe"
+  Delete "$INSTDIR\rpng2-win.exe"
+  Delete "$INSTDIR\VisualPng.exe"
+  Delete "$INSTDIR\wpng.exe"
+!endif
+  RMDir "$INSTDIR"
+!endif
+SectionEnd

Added: trunk/src/uninst-pango.nsi
===================================================================
--- trunk/src/uninst-pango.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-pango.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,58 @@
+# 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
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/pango-${gpg4win_pkg_pango_version}
+
+
+; Uninstaller section.
+Section "-un.pango"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_pango_src}"
+  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\etc\pango\pango.aliases"
+  Delete "$INSTDIR\etc\pango\pango.modules"
+  RMDir "$INSTDIR\etc\pango"
+  RMDir "$INSTDIR\etc"
+
+  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-arabic-fc.dll"
+  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-basic-fc.dll"
+  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-basic-win32.dll"
+  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-hangul-fc.dll"
+  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-hebrew-fc.dll"
+  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-indic-fc.dll"
+  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-khmer-fc.dll"
+  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-syriac-fc.dll"
+  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-thai-fc.dll"
+  Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-tibetan-fc.dll"
+  RMDir "$INSTDIR\lib\pango\1.4.0\modules"
+  RMDir "$INSTDIR\lib\pango\1.4.0"
+  RMDir "$INSTDIR\lib\pango"
+  RMDir "$INSTDIR\lib"
+  RMDir "$INSTDIR"
+!endif
+SectionEnd

Added: trunk/src/uninst-pkgconfig.nsi
===================================================================
--- trunk/src/uninst-pkgconfig.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-pkgconfig.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,34 @@
+# uninst-pkgconfig.nsi - Installer for pkgconfig.  -*- 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/pkgconfig-${gpg4win_pkg_pkgconfig_version}
+
+
+; Uninstaller section.
+Section "-un.pkgconfig"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_pkgconfig_src}"
+  Call un.SourceDelete
+!else
+!endif
+SectionEnd

Added: trunk/src/uninst-zlib.nsi
===================================================================
--- trunk/src/uninst-zlib.nsi	2005-10-21 12:50:29 UTC (rev 32)
+++ trunk/src/uninst-zlib.nsi	2005-10-22 12:00:20 UTC (rev 33)
@@ -0,0 +1,36 @@
+# 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
+
+
+!ifdef prefix
+!undef prefix
+!endif
+!define prefix ${ipdir}/zlib-${gpg4win_pkg_zlib_version}
+
+
+; Uninstaller section.
+Section "-un.zlib"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_zlib_src}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\zlib1.dll"
+  RMDir "$INSTDIR"
+!endif
+SectionEnd



More information about the Gpg4win-commits mailing list