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

[scm-commit@wald.intevation.org]

Author: werner
Date: 2007-10-11 09:56:27 +0200 (Thu, 11 Oct 2007)
New Revision: 559

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/packages/packages.current
   trunk/src/Makefile.am
Log:
Updated Kleopatra

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-10 00:13:45 UTC (rev 558)
+++ trunk/ChangeLog	2007-10-11 07:56:27 UTC (rev 559)
@@ -1,3 +1,11 @@
+2007-10-11  Werner Koch  <wk at g10code.com>
+
+	* packages/packages.current: Update kleopatra.
+
+	* configure.ac (gpgol): Add libassuan as dependency.
+	* src/Makefile.am (gpg4win_pkg_gpgol_configure): Add
+	--with-libassuan-prefix.
+
 2007-10-10  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/inst-kdelibs.nsi: Do not install libkdefx.dll.
@@ -15,6 +23,10 @@
 	* src/Makefile.am (gpg4win_pkg_gpa_configure): Add search path for
 	libassuan and gpg-error.
 
+2007-10-06  Werner Koch  <wk at g10code.com>
+
+	* packages/packages.current: Fixed gpgex filename to be .gz.
+
 2007-10-05  Marcus Brinkmann  <marcus at g10code.de>
 
 	* packages/packages.current: Update dirmngr.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-10-10 00:13:45 UTC (rev 558)
+++ trunk/configure.ac	2007-10-11 07:56:27 UTC (rev 559)
@@ -198,7 +198,7 @@
                         w32pth zlib bzip2])
 GPG4WIN_SPKG([pthreads-w32])
 GPG4WIN_SPKG([pinentry])
-GPG4WIN_SPKG([gpgol], [gpgme])
+GPG4WIN_SPKG([gpgol], [gpgme libassuan])
 GPG4WIN_SPKG([gpgex], [libassuan])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
 GPG4WIN_SPKG([winpt], [gpgme gnupg])

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2007-10-10 00:13:45 UTC (rev 558)
+++ trunk/packages/packages.current	2007-10-11 07:56:27 UTC (rev 559)
@@ -348,8 +348,8 @@
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-name kleopatra-20071009-3-bin.zip
-file kleo-uiserver-only-20071009-3-bin.zip
+name kleopatra-20071010-2-bin.zip
+file kleo-uiserver-only-20071010-2-bin.zip
 # FIXME: This is totally wrong.  We don't have a source package!
-link kleopatra-20071009-3-src.zip
-chk 035420fa630cc2537f84621f43a43c11289fe147
+link kleopatra-20071010-2-src.zip
+chk a4cdfc8b58d7eb43dc9299e899f9af6f0364e9f6
\ No newline at end of file

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-10-10 00:13:45 UTC (rev 558)
+++ trunk/src/Makefile.am	2007-10-11 07:56:27 UTC (rev 559)
@@ -170,7 +170,8 @@
   --with-libassuan-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
 gpg4win_pkg_gpgol_configure = --silent \
-  --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)
+  --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir) \
+  --with-libassuan-prefix=$(idir)
 
 gpg4win_pkg_gpgex_configure = --silent \
   --with-gpg-error-prefix=$(idir) \