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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-02-27 12:19:46 +0100 (Wed, 27 Feb 2008)
New Revision: 726

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

	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Move plugins
	to INSTDIR.
	* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi: Likewise.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-26 20:17:50 UTC (rev 725)
+++ trunk/ChangeLog	2008-02-27 11:19:46 UTC (rev 726)
@@ -1,3 +1,9 @@
+2008-02-27  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Move plugins
+	to INSTDIR.
+	* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi: Likewise.
+
 2008-02-26  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Fix last change.

Modified: trunk/src/inst-kdelibs.nsi
===================================================================
--- trunk/src/inst-kdelibs.nsi	2008-02-26 20:17:50 UTC (rev 725)
+++ trunk/src/inst-kdelibs.nsi	2008-02-27 11:19:46 UTC (rev 726)
@@ -48,15 +48,12 @@
   File ${prefix}/lib/libkdecore.dll
   File ${prefix}/lib/libkdeinit4_kbuildsycoca4.dll
   File ${prefix}/lib/libkdeui.dll
+  File ${prefix}/lib/kde4/kded_globalaccel.dll
 
   SetOutPath "$INSTDIR\etc\xdg\menus"
 
   File ${prefix}/etc/xdg/menus/applications.menu
 
-  SetOutPath "$INSTDIR\lib\kde4"
-
-  File ${prefix}/lib/kde4/kded_globalaccel.dll
-
   SetOutPath "$INSTDIR\share\apps\kcharselect"
 
   File ${prefix}/share/apps/kcharselect/kcharselect-data

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2008-02-26 20:17:50 UTC (rev 725)
+++ trunk/src/inst-kleopatra.nsi	2008-02-27 11:19:46 UTC (rev 726)
@@ -37,9 +37,6 @@
 
   File ${prefix}/bin/kgpgconf.exe
   File ${prefix}/bin/libkleo.dll
-
-  SetOutPath "$INSTDIR\lib\kde4"
-
   File ${prefix}/lib/kde4/kcm_kleopatra.dll
 
   SetOutPath "$INSTDIR\share\applications\kde4"

Modified: trunk/src/uninst-kdelibs.nsi
===================================================================
--- trunk/src/uninst-kdelibs.nsi	2008-02-26 20:17:50 UTC (rev 725)
+++ trunk/src/uninst-kdelibs.nsi	2008-02-27 11:19:46 UTC (rev 726)
@@ -35,6 +35,7 @@
   Delete "$INSTDIR\bin\kcmdwrapper.exe"
   RMDir "$INSTDIR\bin"
 
+  Delete "$INSTDIR\kded_globalaccel.dll"
   Delete "$INSTDIR\libkdeui.dll"
   Delete "$INSTDIR\libkdeinit4_kbuildsycoca4.dll"
   Delete "$INSTDIR\libkdecore.dll"
@@ -84,7 +85,6 @@
   Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-middle.png"
   Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-left.png"
   Delete "$INSTDIR\share\apps\kcharselect\kcharselect-data"
-  Delete "$INSTDIR\lib\kde4\kded_globalaccel.dll"
   Delete "$INSTDIR\etc\xdg\menus\applications.menu"
 
   RMDir "$INSTDIR\share\locale"

Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi	2008-02-26 20:17:50 UTC (rev 725)
+++ trunk/src/uninst-kleopatra.nsi	2008-02-27 11:19:46 UTC (rev 726)
@@ -43,6 +43,10 @@
   Delete "$INSTDIR\share\applications\kde4\kleopatra_config_dirserv.desktop"
   Delete "$INSTDIR\share\applications\kde4\kleopatra_config_appear.desktop"
 
+  Delete "$INSTDIR\kcm_kleopatra.dll"
+  Delete "$INSTDIR\libkleo.dll"
+  Delete "$INSTDIR\kgpgconf.exe"
+
   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"
@@ -132,9 +136,6 @@
   Delete "$INSTDIR\share\apps\kleopatra\kleopatraui.rc"
   Delete "$INSTDIR\share\apps\kleopatra\kleopatra_newui.rc"
   Delete "$INSTDIR\share\applications\kde4\kleopatra_import.desktop"
-  Delete "$INSTDIR\lib\kde4\kcm_kleopatra.dll"
-  Delete "$INSTDIR\libkleo.dll"
-  Delete "$INSTDIR\kgpgconf.exe"
 
   RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
   RMDir "$INSTDIR\share\locale\de"