[Gpg4win-commits] r706 - in trunk: . packages src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-02-08 23:05:15 +0100 (Fri, 08 Feb 2008)
New Revision: 706

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

	* packages/packages.current: Update kleopatra.
	* src/inst-kdelibs.nsi: Move kcmdwrapper.exe to bin.
	* src/uninst-kdelibs.nsi: Uninstall it there.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-02-06 14:08:17 UTC (rev 705)
+++ trunk/ChangeLog	2008-02-08 22:05:15 UTC (rev 706)
@@ -1,3 +1,9 @@
+2008-02-08  Marcus Brinkmann  <marcus at g10code.de>
+
+	* packages/packages.current: Update kleopatra.
+	* src/inst-kdelibs.nsi: Move kcmdwrapper.exe to bin.
+	* src/uninst-kdelibs.nsi: Uninstall it there.
+
 2008-02-06  Werner Koch  <wk at g10code.com>
 
 	* packages/packages.current: Update GpgOL.

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-02-06 14:08:17 UTC (rev 705)
+++ trunk/packages/packages.current	2008-02-08 22:05:15 UTC (rev 706)
@@ -365,10 +365,10 @@
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-name kleopatra-20080204-bin.zip
-file kleo-uiserver-only-20080204-bin.zip
-chk  ea7cb22f610d209a740dc34edafc4e2f46df400e
+name kleopatra-20080208-bin.zip
+file kleo-uiserver-only-20080208-bin.zip
+chk  dd787edc6911c1a4fe45db5de89418e1de73cbc7
 
-name kleopatra-20080204-src.zip
-file kleo-uiserver-only-20080204-src.zip
-chk  6d7139c19bad5734464d1ec23108395ba68c3e88
+name kleopatra-20080208-src.zip
+file kleo-uiserver-only-20080208-src.zip
+chk  1b63fcf1c8b48d56c20a1d1e6adf64667bd38512

Modified: trunk/src/inst-kdelibs.nsi
===================================================================
--- trunk/src/inst-kdelibs.nsi	2008-02-06 14:08:17 UTC (rev 705)
+++ trunk/src/inst-kdelibs.nsi	2008-02-08 22:05:15 UTC (rev 706)
@@ -33,7 +33,11 @@
   File "${gpg4win_pkg_kdelibs_src}"
 !else
 
+  # Relocate this when dbus-daemon is relocated.
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/kcmdwrapper.exe
+  SetOutPath "$INSTDIR"
+
   File ${prefix}/bin/libkdecore.dll
   File ${prefix}/bin/libkdeui.dll
 #  File ${prefix}/bin/libkdefx.dll

Modified: trunk/src/uninst-kdelibs.nsi
===================================================================
--- trunk/src/uninst-kdelibs.nsi	2008-02-06 14:08:17 UTC (rev 705)
+++ trunk/src/uninst-kdelibs.nsi	2008-02-08 22:05:15 UTC (rev 706)
@@ -31,7 +31,9 @@
   Call un.SourceDelete
 !else
 
-  Delete "$INSTDIR\kcmdwrapper.exe"
+  # FIXME: See inst-kleopatra.nsi
+  Delete "$INSTDIR\bin\kcmdwrapper.exe"
+  RMDir "$INSTDIR\bin"
   Delete "$INSTDIR\libkdecore.dll"
   Delete "$INSTDIR\libkdeui.dll"
   Delete "$INSTDIR\libkdefx.dll"