[Gpg4win-commits] r565 - in trunk: . src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Oct 16 16:39:12 CEST 2007
Author: marcus
Date: 2007-10-16 16:39:11 +0200 (Tue, 16 Oct 2007)
New Revision: 565
Modified:
trunk/ChangeLog
trunk/src/inst-kleopatra.nsi
trunk/src/uninst-dirmngr.nsi
trunk/src/uninst-kdelibs.nsi
trunk/src/uninst-kleopatra.nsi
trunk/src/uninst-pinentry.nsi
trunk/src/uninst-qt.nsi
Log:
2007-10-16 Marcus Brinkmann <marcus at g10code.de>
* src/uninst-qt.nsi: Uninstall mingwm10.dll.
* src/inst-kleopatra.nsi: Fix slash instead backslash error.
* src/uninst-kdelibs.nsi: Remove directories share\config\ui and
share\config instead share\ui. Remove directories
share\kde4\services and share\kde4.
* src/uninst-pinentry.nsi: Uninstall pinentry-w32.exe and
pinentry-gtk-2.exe.
* src/uninst-kleopatra.nsi: Uninstall kleopatra.bat.
Remove directory share\apps\kleopatra.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-10-16 13:04:21 UTC (rev 564)
+++ trunk/ChangeLog 2007-10-16 14:39:11 UTC (rev 565)
@@ -1,5 +1,15 @@
2007-10-16 Marcus Brinkmann <marcus at g10code.de>
+ * src/uninst-qt.nsi: Uninstall mingwm10.dll.
+ * src/inst-kleopatra.nsi: Fix slash instead backslash error.
+ * src/uninst-kdelibs.nsi: Remove directories share\config\ui and
+ share\config instead share\ui. Remove directories
+ share\kde4\services and share\kde4.
+ * src/uninst-pinentry.nsi: Uninstall pinentry-w32.exe and
+ pinentry-gtk-2.exe.
+ * src/uninst-kleopatra.nsi: Uninstall kleopatra.bat.
+ Remove directory share\apps\kleopatra.
+
* packages/packages.current: Enable gpgex.
2007-10-15 Marcus Brinkmann <marcus at g10code.de>
Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi 2007-10-16 13:04:21 UTC (rev 564)
+++ trunk/src/inst-kleopatra.nsi 2007-10-16 14:39:11 UTC (rev 565)
@@ -51,7 +51,7 @@
File ${prefix}/share/apps/kleopatra/kleopatraui.rc
- SetOutPath "$INSTDIR\share\apps\libkleopatra/pics"
+ SetOutPath "$INSTDIR\share\apps\libkleopatra\pics"
File ${prefix}/share/apps/libkleopatra/pics/chiasmus_chi.png
File ${prefix}/share/apps/libkleopatra/pics/key.png
Modified: trunk/src/uninst-dirmngr.nsi
===================================================================
--- trunk/src/uninst-dirmngr.nsi 2007-10-16 13:04:21 UTC (rev 564)
+++ trunk/src/uninst-dirmngr.nsi 2007-10-16 14:39:11 UTC (rev 565)
@@ -42,5 +42,7 @@
RMDir "$INSTDIR\cache"
RMDir "$INSTDIR"
+ # Remove etc files.
+
!endif
SectionEnd
Modified: trunk/src/uninst-kdelibs.nsi
===================================================================
--- trunk/src/uninst-kdelibs.nsi 2007-10-16 13:04:21 UTC (rev 564)
+++ trunk/src/uninst-kdelibs.nsi 2007-10-16 14:39:11 UTC (rev 565)
@@ -92,16 +92,19 @@
Delete "$INSTDIR\share\config\ui\ui_standards.rc"
- RMDir "$INSTDIR\share\ui"
+ RMDir "$INSTDIR\share\config\ui"
+ RMDir "$INSTDIR\share\config"
Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
RMDir "$INSTDIR\share\kde4\services\kded"
+ RMDir "$INSTDIR\share\kde4\services"
Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
RMDir "$INSTDIR\share\kde4\servicetypes"
+ RMDir "$INSTDIR\share\kde4"
Delete "$INSTDIR\share\locale\all_languages"
Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi 2007-10-16 13:04:21 UTC (rev 564)
+++ trunk/src/uninst-kleopatra.nsi 2007-10-16 14:39:11 UTC (rev 565)
@@ -34,6 +34,7 @@
# FIXME: See inst-kleopatra.nsi
Delete "$INSTDIR\bin\kleopatra.exe"
RMDir "$INSTDIR\bin"
+ Delete "$INSTDIR\kleopatra.bat"
Delete "$INSTDIR\libgpgme++-glib.dll"
Delete "$INSTDIR\libgpgme++-qt.dll"
@@ -47,6 +48,8 @@
RMDir "$INSTDIR\share\applications"
Delete "$INSTDIR\share\apps\kleopatra\kleopatraui.rc"
+ RMDir "$INSTDIR\share\apps\kleopatra"
+
Delete "$INSTDIR\share\apps\libkleopatra\pics\chiasmus_chi.png"
Delete "$INSTDIR\share\apps\libkleopatra\pics\key.png"
Delete "$INSTDIR\share\apps\libkleopatra\pics\key_bad.png"
Modified: trunk/src/uninst-pinentry.nsi
===================================================================
--- trunk/src/uninst-pinentry.nsi 2007-10-16 13:04:21 UTC (rev 564)
+++ trunk/src/uninst-pinentry.nsi 2007-10-16 14:39:11 UTC (rev 565)
@@ -31,6 +31,8 @@
Push "${gpg4win_pkg_pinentry}"
Call un.SourceDelete
!else
+ Delete "$INSTDIR\pinentry-w32.exe"
+ Delete "$INSTDIR\pinentry-gtk-2.exe"
Delete "$INSTDIR\pinentry.exe"
!endif
Modified: trunk/src/uninst-qt.nsi
===================================================================
--- trunk/src/uninst-qt.nsi 2007-10-16 13:04:21 UTC (rev 564)
+++ trunk/src/uninst-qt.nsi 2007-10-16 14:39:11 UTC (rev 565)
@@ -30,6 +30,8 @@
Push "${gpg4win_pkg_qt_src}"
Call un.SourceDelete
!else
+ Delete "$INSTDIR\mingwm10.dll"
+
Delete "$INSTDIR\Qt3Support4.dll"
Delete "$INSTDIR\QtAssistantClient4.dll"
Delete "$INSTDIR\QtCore4.dll"
More information about the Gpg4win-commits
mailing list