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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-09-28 18:01:23 +0200 (Fri, 28 Sep 2007)
New Revision: 543

Modified:
   trunk/ChangeLog
   trunk/src/inst-kdesupport.nsi
   trunk/src/inst-kleopatra.nsi
   trunk/src/uninst-kdesupport.nsi
   trunk/src/uninst-kleopatra.nsi
Log:
2007-09-28  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-kleopatra.nsi: Put kleopatra into bin for now.
	* src/uninst-kleopatra.nsi: Remove it from there.
	* src/inst-kdesupport.nsi: Put dbus-daemon into bin for now, and
	install missing config files.
	* src/uninst-kdesupport.nsi: Uninstall these files.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-09-27 20:14:09 UTC (rev 542)
+++ trunk/ChangeLog	2007-09-28 16:01:23 UTC (rev 543)
@@ -1,3 +1,11 @@
+2007-09-28  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/inst-kleopatra.nsi: Put kleopatra into bin for now.
+	* src/uninst-kleopatra.nsi: Remove it from there.
+	* src/inst-kdesupport.nsi: Put dbus-daemon into bin for now, and
+	install missing config files.
+	* src/uninst-kdesupport.nsi: Uninstall these files.
+
 2007-09-26  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/inst-gnupg2.nsi: Put it in the read-only section.

Modified: trunk/src/inst-kdesupport.nsi
===================================================================
--- trunk/src/inst-kdesupport.nsi	2007-09-27 20:14:09 UTC (rev 542)
+++ trunk/src/inst-kdesupport.nsi	2007-09-28 16:01:23 UTC (rev 543)
@@ -32,7 +32,11 @@
 !ifdef SOURCES
   File "${gpg4win_pkg_kdesupport_src}"
 !else
+  # FIXME: Figure out how to relocate dbus-daemon (and kleopatra).
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/dbus-daemon.exe
+  SetOutPath "$INSTDIR"
+
   File ${prefix}/bin/dbus-launch.exe
   File ${prefix}/bin/dbus-monitor.exe
   File ${prefix}/bin/dbus-send.exe
@@ -46,6 +50,7 @@
 !undef prefix
 !define prefix ${ipdir}/kdesupport-dev-${gpg4win_pkg_kdesupport_version}
 
+  SetOutPath "$INSTDIR"
   File ${prefix}/bin/giflib4.dll
   File ${prefix}/bin/libdbus-1.dll
   File ${prefix}/bin/libeay32.dll
@@ -61,5 +66,9 @@
   File ${prefix}/bin/pcreposix.dll
   File ${prefix}/bin/ssleay32.dll
 
+  SetOutPath "$INSTDIR\etc"
+  File ${prefix}/etc/session.conf
+  File ${prefix}/etc/system.conf
+
 !endif
 SectionEnd

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2007-09-27 20:14:09 UTC (rev 542)
+++ trunk/src/inst-kleopatra.nsi	2007-09-28 16:01:23 UTC (rev 543)
@@ -29,7 +29,11 @@
   File "${gpg4win_pkg_kleopatra_src}"
 !else
 
+  # Relocate this when dbus-daemon is relocated.
+  SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/kleopatra.exe
+  SetOutPath "$INSTDIR"
+
   File ${prefix}/bin/test_uiserver.exe
   File ${prefix}/lib/libgpgme++-glib.dll
   File ${prefix}/lib/libgpgme++-qt.dll

Modified: trunk/src/uninst-kdesupport.nsi
===================================================================
--- trunk/src/uninst-kdesupport.nsi	2007-09-27 20:14:09 UTC (rev 542)
+++ trunk/src/uninst-kdesupport.nsi	2007-09-28 16:01:23 UTC (rev 543)
@@ -30,7 +30,10 @@
   Push "${gpg4win_pkg_kdesupport_src}"
   Call un.SourceDelete
 !else
-  Delete "$INSTDIR\dbus-daemon.exe"
+  # FIXME: See inst-kdesupport.nsi.
+  Delete "$INSTDIR\bin\dbus-daemon.exe"
+  RMDir "$INSTDIR\bin"
+
   Delete "$INSTDIR\dbus-launch.exe"
   Delete "$INSTDIR\dbus-monitor.exe"
   Delete "$INSTDIR\dbus-send.exe"
@@ -55,6 +58,10 @@
   Delete "$INSTDIR\pcreposix.dll"
   Delete "$INSTDIR\ssleay32.dll"
 
+  Delete "$INSTDIR\etc\session.conf"
+  Delete "$INSTDIR\etc\system.conf"
+  RMDir "$INSTDIR\etc"
+
   RMDir "$INSTDIR"
 !endif
 SectionEnd

Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi	2007-09-27 20:14:09 UTC (rev 542)
+++ trunk/src/uninst-kleopatra.nsi	2007-09-28 16:01:23 UTC (rev 543)
@@ -31,8 +31,12 @@
   Call un.SourceDelete
 !else
 
-  Delete "$INSTDIR\kleopatra.exe"
+  # FIXME: See inst-kleopatra.nsi
+  Delete "$INSTDIR\bin\kleopatra.exe"
+  RMDir "$INSTDIR\bin"
+
   Delete "$INSTDIR\test_uiserver.exe"
+
   Delete "$INSTDIR\libgpgme++-glib.dll"
   Delete "$INSTDIR\libgpgme++-qt.dll"
   Delete "$INSTDIR\libgpgme++.dll"