[Gpg4win-commits] r577 - in trunk: . packages src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Nov 2 13:17:25 CET 2007
Author: werner
Date: 2007-11-02 13:17:24 +0100 (Fri, 02 Nov 2007)
New Revision: 577
Modified:
trunk/ChangeLog
trunk/packages/packages.current
trunk/src/g4wihelp.c
trunk/src/inst-kleopatra.nsi
trunk/src/uninst-kleopatra.nsi
Log:
Updated to current Kleopatra.
Removed some debug output
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-10-30 08:54:57 UTC (rev 576)
+++ trunk/ChangeLog 2007-11-02 12:17:24 UTC (rev 577)
@@ -1,3 +1,9 @@
+2007-11-02 Werner Koch <wk at g10code.com>
+
+ * src/g4wihelp.c (path_add): Remove debug stuff.
+
+ * src/inst-kleopatra.nsi: Adjust location for some DLLs.
+
2007-10-26 Marcus Brinkmann <marcus at g10code.de>
* packages/packages.current: Add libetpan.
Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current 2007-10-30 08:54:57 UTC (rev 576)
+++ trunk/packages/packages.current 2007-11-02 12:17:24 UTC (rev 577)
@@ -224,8 +224,8 @@
server ftp://ftp.g10code.com/g10code/scratch
-file gpgex-0.0.0-svn35.tar.bz2
-chk 971dab9e13a27c47ddbd3ef83fb78bdeeb7ea11e
+file gpgex-0.0.0-svn37.tar.bz2
+chk fef1f4579541137855a2c36737b9936a2fbaec76
#
# Pth emulation
@@ -340,26 +340,26 @@
server ftp://ftp.kdab.net/pub/gpg4win
-name kdelibs-20071009-bin.zip
-file kdelibs-for-kleo-20071009-bin.zip
-chk d0c5f45d84535303b76456df81d9bb5fe937e0ec
+name kdelibs-20071030-bin.zip
+file kdelibs-for-kleo-20071030-bin.zip
+chk 4151b43b61b7e218e7ecaa54943c8c5ab812f7db
-name kdelibs-20071009-lib.zip
-file kdelibs-for-kleo-20071009-dev.zip
-chk 4894ea9b0175b83d956d9d9998d4db247d49ae13
+name kdelibs-20071030-lib.zip
+file kdelibs-for-kleo-20071030-dev.zip
+chk 13e79e3575675e02f74b782f5433c8efa7d918d2
-name kdelibs-20071009-src.zip
+name kdelibs-20071030-src.zip
# FIXME: This is very wrong. It's not a zip file and does not contain
# all the sources.
file kdelibs-svn713936.tar.bz2
-chk 7c2b10819ed4eb1c17e7b5076b9e494ad8bdddbb
+chk 312e5a68c27d693b16b0a703b4fe849301cf8389
# Kleopatra
server ftp://ftp.kdab.net/pub/gpg4win
-name kleopatra-20071016-bin.zip
-file kleo-uiserver-only-20071016-bin.zip
+name kleopatra-20071031-bin.zip
+file kleo-uiserver-only-20071031-bin.zip
# FIXME: This is totally wrong. We don't have a source package!
-link kleopatra-20071016-src.zip
-chk a4cdfc8b58d7eb43dc9299e899f9af6f0364e9f6
\ No newline at end of file
+link kleopatra-20071031-src.zip
+chk d166fdd8a1dd91213b6c95a6c7296d991ebb9be7
Modified: trunk/src/g4wihelp.c
===================================================================
--- trunk/src/g4wihelp.c 2007-10-30 08:54:57 UTC (rev 576)
+++ trunk/src/g4wihelp.c 2007-11-02 12:17:24 UTC (rev 577)
@@ -980,13 +980,13 @@
setuservariable (INST_R0, "0");
- MessageBox (g_hwndParent, "XXX 1", 0, MB_OK);
+/* MessageBox (g_hwndParent, "XXX 1", 0, MB_OK); */
/* The expected stack layout: path component. */
if (popstring (dir, sizeof (dir)))
return;
- MessageBox (g_hwndParent, "XXX 2", 0, MB_OK);
+/* MessageBox (g_hwndParent, "XXX 2", 0, MB_OK); */
path = read_w32_registry_string (ENV_HK, ENV_REG, "Path");
if (! path)
@@ -995,7 +995,7 @@
return;
}
- MessageBox (g_hwndParent, "XXX 3", 0, MB_OK);
+/* MessageBox (g_hwndParent, "XXX 3", 0, MB_OK); */
/* Old path plus semicolon plus dir plus terminating nul. */
path_new_size = strlen (path) + 1 + strlen (dir) + 1;
@@ -1006,7 +1006,7 @@
return;
}
- MessageBox (g_hwndParent, "XXX 4", 0, MB_OK);
+/* MessageBox (g_hwndParent, "XXX 4", 0, MB_OK); */
path_new = malloc (path_new_size);
if (!path_new)
@@ -1015,21 +1015,21 @@
return;
}
- MessageBox (g_hwndParent, "XXX 5", 0, MB_OK);
+/* MessageBox (g_hwndParent, "XXX 5", 0, MB_OK); */
strcpy (path_new, path);
strcat (path_new, ";");
strcat (path_new, dir);
- MessageBox (g_hwndParent, "XXX 6", 0, MB_OK);
- MessageBox (g_hwndParent, dir, 0, MB_OK);
- MessageBox (g_hwndParent, "XXX 7", 0, MB_OK);
+/* MessageBox (g_hwndParent, "XXX 6", 0, MB_OK); */
+/* MessageBox (g_hwndParent, dir, 0, MB_OK); */
+/* MessageBox (g_hwndParent, "XXX 7", 0, MB_OK); */
/* Check if the directory already exists in the path. */
comp = strtok (path, delims);
do
{
- MessageBox (g_hwndParent, comp, 0, MB_OK);
+/* MessageBox (g_hwndParent, comp, 0, MB_OK); */
if (!strcmp (comp, dir))
{
@@ -1042,7 +1042,7 @@
while (comp);
free (path);
- MessageBox (g_hwndParent, "XXX 8", 0, MB_OK);
+/* MessageBox (g_hwndParent, "XXX 8", 0, MB_OK); */
/* Set a key for our CLSID. */
RegCreateKey (ENV_HK, ENV_REG, &key_handle);
@@ -1051,7 +1051,7 @@
RegCloseKey (key_handle);
free (path_new);
- MessageBox (g_hwndParent, "XXX 9", 0, MB_OK);
+/* MessageBox (g_hwndParent, "XXX 9", 0, MB_OK); */
setuservariable (INST_R0, "1");
}
Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi 2007-10-30 08:54:57 UTC (rev 576)
+++ trunk/src/inst-kleopatra.nsi 2007-11-02 12:17:24 UTC (rev 577)
@@ -35,11 +35,11 @@
SetOutPath "$INSTDIR"
File kleopatra.bat
- File ${prefix}/lib/libgpgme++-glib.dll
- File ${prefix}/lib/libgpgme++-qt.dll
- File ${prefix}/lib/libgpgme++.dll
+ File ${prefix}/bin/libgpgme++-glib.dll
+ File ${prefix}/bin/libgpgme++-qt.dll
+ File ${prefix}/bin/libgpgme++.dll
+ File ${prefix}/bin/libqgpgme.dll
File ${prefix}/lib/libkleo.dll
- File ${prefix}/lib/libqgpgme.dll
SetOutPath "$INSTDIR\lib\kde4"
Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi 2007-10-30 08:54:57 UTC (rev 576)
+++ trunk/src/uninst-kleopatra.nsi 2007-11-02 12:17:24 UTC (rev 577)
@@ -39,8 +39,8 @@
Delete "$INSTDIR\libgpgme++-glib.dll"
Delete "$INSTDIR\libgpgme++-qt.dll"
Delete "$INSTDIR\libgpgme++.dll"
+ Delete "$INSTDIR\libqgpgme.dll"
Delete "$INSTDIR\libkleo.dll"
- Delete "$INSTDIR\libqgpgme.dll"
Delete "$INSTDIR\share\applications\kde4\kleopatra_import.desktop"
More information about the Gpg4win-commits
mailing list