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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-05-07 18:13:27 +0200 (Wed, 07 May 2008)
New Revision: 802

Modified:
   trunk/ChangeLog
   trunk/packages/packages.current
   trunk/src/inst-kleopatra.nsi
   trunk/src/uninst-kleopatra.nsi
Log:
2008-05-07  Marcus Brinkmann  <marcus at ulysses.g10code.com>

	* packages/packages.current: Update kleopatra and kdelibs.
	* src/inst-kleopatra.nsi: Add kwatchgnupg.
	* src/uninst-kleopatra.nsi: Remove kwatchgnupg.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-05-07 16:11:20 UTC (rev 801)
+++ trunk/ChangeLog	2008-05-07 16:13:27 UTC (rev 802)
@@ -1,3 +1,9 @@
+2008-05-07  Marcus Brinkmann  <marcus at ulysses.g10code.com>
+
+	* packages/packages.current: Update kleopatra and kdelibs.
+	* src/inst-kleopatra.nsi: Add kwatchgnupg.
+	* src/uninst-kleopatra.nsi: Remove kwatchgnupg.
+
 2008-05-07  Werner Koch  <wk at g10code.com>
 
 	* patches/gpgol/01-last-minute.patch: New.

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-05-07 16:11:20 UTC (rev 801)
+++ trunk/packages/packages.current	2008-05-07 16:13:27 UTC (rev 802)
@@ -376,24 +376,25 @@
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-name kdelibs-20080428-bin.zip
-file kdelibs-for-kleo-20080428-bin.zip
-chk  1528e2eae5ae222fc0481a7c8aaba4f0b0b6fc8d
+name kdelibs-20080507-bin.zip
+file kdelibs-for-kleo-20080507-bin.zip
+chk  1acdb7c4a223bbedfee6713b3beba91c250519ac
 
-name kdelibs-20080428-lib.zip
-file kdelibs-for-kleo-20080428-dev.zip
-chk  78621c8476abd94fdbcaa64b79005783cb8155c0
+name kdelibs-20080507-lib.zip
+file kdelibs-for-kleo-20080507-dev.zip
+chk  59ece5a951d606b2ac7420684de3db46ac0ecc2a
 
-name kdelibs-20080428-src.zip
-file kdelibs-for-kleo-20080428-src.zip
-chk  9bfa30a8e678f967c52a5e87412e23b80a42a3bb
+name kdelibs-20080507-src.zip
+file kdelibs-for-kleo-20080507-src.zip
+chk  s6d89211030b83db36aa8356f5e7f0a4e3e3d7c80
 
 # Kleopatra
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-file kleopatra-20080428-bin.zip
-chk  52377ca9f20c8fc50d24653deb53734b79d83011
+file kleopatra-20080507-bin.zip
+chk  ce1e97f4756bc8bf295c4ad150207b4ffc9b8b62
 
-file kleopatra-20080428-src.zip
-chk  3ee6858ed396077de9b730c28c933ff19912f5d4
+file kleopatra-20080507-src.zip
+chk  f3982f59e0e04ff98ece3100e2c822632fb45c3e
+

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2008-05-07 16:11:20 UTC (rev 801)
+++ trunk/src/inst-kleopatra.nsi	2008-05-07 16:13:27 UTC (rev 802)
@@ -36,6 +36,7 @@
   File /oname=kleopatra.exe "${BUILD_DIR}/kleowrap.exe"
 
   File ${prefix}/bin/kgpgconf.exe
+  File ${prefix}/bin/kwatchgnupg.exe
   File ${prefix}/bin/libkleo.dll
   File ${prefix}/lib/kde4/kcm_kleopatra.dll
 
@@ -46,7 +47,6 @@
   SetOutPath "$INSTDIR\share\apps\kleopatra"
 
   File ${prefix}/share/apps/kleopatra/kleopatra.rc
-  File ${prefix}/share/apps/kleopatra/kleopatraui.rc
 
   SetOutPath "$INSTDIR\share\apps\kleopatra\pics"
 
@@ -55,6 +55,15 @@
   File ${prefix}/share/apps/kleopatra/pics/kleopatra_wizard.png
   File ${prefix}/share/apps/kleopatra/pics/kleopatra_wizard.svgz
 
+  SetOutPath "$INSTDIR\share\apps\kwatchgnupg"
+
+  File ${prefix}/share/apps/kwatchgnupg/kwatchgnupgui.rc
+
+  SetOutPath "$INSTDIR\share\apps\kwatchgnupg\pics"
+
+  File ${prefix}/share/apps/kwatchgnupg/pics/kwatchgnupg.png
+  File ${prefix}/share/apps/kwatchgnupg/pics/kwatchgnupg2.png
+
   SetOutPath "$INSTDIR\share\apps\libkleopatra\pics"
 
   File ${prefix}/share/apps/libkleopatra/pics/chiasmus_chi.png

Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi	2008-05-07 16:11:20 UTC (rev 801)
+++ trunk/src/uninst-kleopatra.nsi	2008-05-07 16:13:27 UTC (rev 802)
@@ -38,7 +38,7 @@
 
   # FIXME: See inst-kleopatra.nsi
 
-  Delete "$INSTDIR\share\kde4\applications\kleopatra_config_smimevalidation.desktop"
+  Delete "$INSTDIR\share\applications\kde4\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"
@@ -46,6 +46,7 @@
   Delete "$INSTDIR\kcm_kleopatra.dll"
   Delete "$INSTDIR\libkleo.dll"
   Delete "$INSTDIR\kgpgconf.exe"
+  Delete "$INSTDIR\kwatchgnupg.exe"
 
   Delete "$INSTDIR\share\locale\de\entry.desktop"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\timezones4.mo"
@@ -129,11 +130,13 @@
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key_bad.png"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\key.png"
   Delete "$INSTDIR\share\apps\libkleopatra\pics\chiasmus_chi.png"
+  Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg2.png"
+  Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg.png"
+  Delete "$INSTDIR\share\apps\kwatchgnupg\kwatchgnupgui.rc"
   Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_wizard.svgz"
   Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_wizard.png"
   Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_splashscreen.svgz"
   Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_splashscreen.png"
-  Delete "$INSTDIR\share\apps\kleopatra\kleopatraui.rc"
   Delete "$INSTDIR\share\apps\kleopatra\kleopatra.rc"
   Delete "$INSTDIR\share\applications\kde4\kleopatra_import.desktop"