2008-02-08 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Fri, 8 Feb 2008 22:05:15 +0000 (22:05 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Fri, 8 Feb 2008 22:05:15 +0000 (22:05 +0000)
* packages/packages.current: Update kleopatra.
* src/inst-kdelibs.nsi: Move kcmdwrapper.exe to bin.
* src/uninst-kdelibs.nsi: Uninstall it there.

ChangeLog
packages/packages.current
src/inst-kdelibs.nsi
src/uninst-kdelibs.nsi

index 33b1477..8a35056 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-08  Marcus Brinkmann  <marcus@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@g10code.com>
 
        * packages/packages.current: Update GpgOL.
index 5a54d95..70979c6 100644 (file)
@@ -365,10 +365,10 @@ chk  b08756b5de11e0753987b906d5db3e7379b2919d
 
 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
index e961678..71d2ee7 100644 (file)
@@ -33,7 +33,11 @@ Section "-kdelibs" SEC_kdelibs
   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
index 1d79677..be86cf2 100644 (file)
@@ -31,7 +31,9 @@ Section "-un.kdelibs"
   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"