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

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-10-09 16:04:43 +0200 (Tue, 09 Oct 2007)
New Revision: 557

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/packages/packages.current
   trunk/src/Makefile.am
Log:
2007-10-09  Marcus Brinkmann  <marcus at g10code.de>

	* configure.ac: Fix last change.
	* packages/packages.current: Update gpgex.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-10-08 13:37:34 UTC (rev 556)
+++ trunk/ChangeLog	2007-10-09 14:04:43 UTC (rev 557)
@@ -1,3 +1,15 @@
+2007-10-09  Marcus Brinkmann  <marcus at g10code.de>
+
+	* configure.ac: Fix last change.
+	* packages/packages.current: Update gpgex.
+
+	* configure.ac: Disable oxygen-icons for now.
+	* packages/packages.current: Disable oxygen-icons for now.  Update
+	kleopatra.
+
+	* src/Makefile.am (gpg4win_pkg_gpa_configure): Add search path for
+	libassuan and gpg-error.
+
 2007-10-05  Marcus Brinkmann  <marcus at g10code.de>
 
 	* packages/packages.current: Update dirmngr.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-10-08 13:37:34 UTC (rev 556)
+++ trunk/configure.ac	2007-10-09 14:04:43 UTC (rev 557)
@@ -217,7 +217,8 @@
 GPG4WIN_BPKG_GNUWIN32([kdesupport])
 GPG4WIN_BPKG_GNUWIN32([qt], [kdesupport])
 GPG4WIN_BPKG_BINSRC([oxygen-icons])
-GPG4WIN_BPKG_GNUWIN32([kdelibs], [qt oxygen-icons])
+#GPG4WIN_BPKG_GNUWIN32([kdelibs], [qt oxygen-icons])
+GPG4WIN_BPKG_GNUWIN32([kdelibs], [qt])
 GPG4WIN_BPKG_BINSRC([kleopatra], [gpgme gnupg gnupg2 kdelibs])
 
 GPG4WIN_FINALIZE

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2007-10-08 13:37:34 UTC (rev 556)
+++ trunk/packages/packages.current	2007-10-09 14:04:43 UTC (rev 557)
@@ -213,8 +213,8 @@
 
 server ftp://ftp.g10code.com/g10code/scratch
 
-file gpgex-0.0.0-svn27.tar.gz
-chk  9db77a2cfb5df475c3cbaeeb37c88053468b1c3c
+file gpgex-0.0.0-svn31.tar.bz2
+chk  d95bbb0602675b5197bab1b7632f597926a2d5ca
 
 #
 # Pth emulation
@@ -315,15 +315,17 @@
 chk 40318619764a5c0ae9aa3796a6f33155d0a90c0d
 
 # oxygen-icons
+# Not yet needed.
+#
 # Source package is identical to binary package.
+#
+# server ftp://ftp.kdab.net/pub/gpg4win
+#
+# name oxygen-icons-20070918-bin.zip
+# file oxygen-icons-20070918.zip
+# link oxygen-icons-20070918-src.zip
+# chk cefb58affdf099069d3b4e14029b4d26abb03ae1
 
-server ftp://ftp.kdab.net/pub/gpg4win
-
-name oxygen-icons-20070918-bin.zip
-file oxygen-icons-20070918.zip
-link oxygen-icons-20070918-src.zip
-chk cefb58affdf099069d3b4e14029b4d26abb03ae1
-
 # kdelibs
 
 server ftp://ftp.kdab.net/pub/gpg4win
@@ -346,8 +348,8 @@
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-name kleopatra-20071004-bin.zip
-file kleo-uiserver-only-20071004-bin.zip
+name kleopatra-20071009-2-bin.zip
+file kleo-uiserver-only-20071009-2-bin.zip
 # FIXME: This is totally wrong.  We don't have a source package!
 link kleopatra-20071004-src.zip
-chk 899bc73254116a278d7bbe4d5f03d57a4e55faa1
+chk 80e8252d1a6ff3b51cf22aac6df9d4cd8460d82c

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-10-08 13:37:34 UTC (rev 556)
+++ trunk/src/Makefile.am	2007-10-09 14:04:43 UTC (rev 557)
@@ -166,7 +166,8 @@
 
 gpg4win_pkg_gpa_configure = --silent \
   --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
-  --with-gpgme-prefix=$(idir) --with-zlib=$(idir)
+  --with-gpgme-prefix=$(idir) --with-zlib=$(idir) \
+  --with-libassuan-prefix=$(idir) --with-gpg-error-prefix=$(idir)
 
 gpg4win_pkg_gpgol_configure = --silent \
   --with-gpgme-prefix=$(idir) --with-gpg-error-prefix=$(idir)