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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-02-26 21:17:50 +0100 (Tue, 26 Feb 2008)
New Revision: 725

Modified:
   trunk/ChangeLog
   trunk/src/inst-kleopatra.nsi
   trunk/src/uninst-kleopatra.nsi
Log:
2008-02-26  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Fix last change.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-26 16:39:29 UTC (rev 724)
+++ trunk/ChangeLog	2008-02-26 20:17:50 UTC (rev 725)
@@ -1,5 +1,7 @@
 2008-02-26  Marcus Brinkmann  <marcus at g10code.de>
 
+	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Fix last change.
+
 	* packages/packages.current: Update gpgol, kdelibs, kleopatra.
 	* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi,
 	src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update.

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2008-02-26 16:39:29 UTC (rev 724)
+++ trunk/src/inst-kleopatra.nsi	2008-02-26 20:17:50 UTC (rev 725)
@@ -98,7 +98,9 @@
 
   File ${prefix}/share/icons/oxygen/scalable/apps/kleopatra.svgz
 
-  SetOutPath "$INSTDIR\share\kde4\services"
+  # FIXME: The kcm .desktop files belong to share/kde4/services
+  # actually, but are not found if installed there.
+  SetOutPath "$INSTDIR\share\applications\kde4"
 
   File ${prefix}/share/kde4/services/kleopatra_config_appear.desktop
   File ${prefix}/share/kde4/services/kleopatra_config_dirserv.desktop

Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi	2008-02-26 16:39:29 UTC (rev 724)
+++ trunk/src/uninst-kleopatra.nsi	2008-02-26 20:17:50 UTC (rev 725)
@@ -36,6 +36,13 @@
   RMDir "$INSTDIR\bin"
   Delete "$INSTDIR\kleopatra.exe"
 
+  # FIXME: See inst-kleopatra.nsi
+
+  Delete "$INSTDIR\share\kde4\applications\kleopatra_config_smimevalidation.desktop"
+  Delete "$INSTDIR\share\applications\kde4\kleopatra_config_dnorder.desktop"
+  Delete "$INSTDIR\share\applications\kde4\kleopatra_config_dirserv.desktop"
+  Delete "$INSTDIR\share\applications\kde4\kleopatra_config_appear.desktop"
+
   Delete "$INSTDIR\share\locale\de\entry.desktop"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\timezones4.mo"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\phonon_kde.mo"
@@ -105,10 +112,6 @@
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepim.mo"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdelibs.mo"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_smimevalidation.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_dnorder.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_dirserv.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_appear.desktop"
   Delete "$INSTDIR\share\icons\oxygen\scalable\apps\kleopatra.svgz"
   Delete "$INSTDIR\share\icons\oxygen\64x64\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\oxygen\48x48\apps\kleopatra.png"
@@ -136,8 +139,6 @@
   RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
   RMDir "$INSTDIR\share\locale\de"
   RMDir "$INSTDIR\share\locale"
-  RMDir "$INSTDIR\share\kde4\services"
-  RMDir "$INSTDIR\share\kde4"
   RMDir "$INSTDIR\share\icons\oxygen\scalable\apps"
   RMDir "$INSTDIR\share\icons\oxygen\scalable"
   RMDir "$INSTDIR\share\icons\oxygen\64x64\apps"