[Gpg4win-commits] r614 - in trunk: . packages

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-11-29 15:46:07 +0100 (Thu, 29 Nov 2007)
New Revision: 614

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/packages/packages.current
Log:
2007-11-29  Marcus Brinkmann  <marcus at g10code.de>

	* packages/packages.current: Update pinentry.
	* configure.ac: Merge duplicated pinentry entries.
	Make gnupg2 dependent on pinentry.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-11-27 13:22:53 UTC (rev 613)
+++ trunk/ChangeLog	2007-11-29 14:46:07 UTC (rev 614)
@@ -1,3 +1,9 @@
+2007-11-29  Marcus Brinkmann  <marcus at g10code.de>
+
+	* packages/packages.current: Update pinentry.
+	* configure.ac: Merge duplicated pinentry entries.
+	Make gnupg2 dependent on pinentry.
+
 2007-11-27  Marcus Brinkmann  <marcus at g10code.de>
 
 	* src/dirmngr.conf: New file.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-11-27 13:22:53 UTC (rev 613)
+++ trunk/configure.ac	2007-11-29 14:46:07 UTC (rev 614)
@@ -191,13 +191,12 @@
 GPG4WIN_SPKG([libassuan], [w32pth])
 GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba])
 GPG4WIN_SPKG([w32pth])
-GPG4WIN_SPKG([pinentry], [libiconv])
+GPG4WIN_SPKG([pinentry], [libiconv gtk+])
 GPG4WIN_SPKG([gpgme], [libgpg-error gnupg glib qt])
 GPG4WIN_SPKG([gnupg], [libiconv bzip2])
 GPG4WIN_SPKG([gnupg2], [libiconv libgcrypt libksba libassuan libgpg-error dnl
-                        w32pth zlib bzip2])
+                        w32pth zlib bzip2 pinentry])
 GPG4WIN_SPKG([pthreads-w32])
-GPG4WIN_SPKG([pinentry], [gtk+])
 GPG4WIN_SPKG([gpgol], [gpgme libassuan])
 GPG4WIN_SPKG([gpgex], [libassuan])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2007-11-27 13:22:53 UTC (rev 613)
+++ trunk/packages/packages.current	2007-11-29 14:46:07 UTC (rev 614)
@@ -262,8 +262,8 @@
 file alpha/libgcrypt/libgcrypt-1.3.1.tar.bz2
 chk  eea6aea27d7e12297630de6b4fcba1b486c809c8
 
-file pinentry/pinentry-0.7.3.tar.gz
-chk  557b886bc7a7030fd185fbc085703ef1ed304db8
+file pinentry/pinentry-0.7.4.tar.gz
+chk  6cd28bda641a6c89d0bb4120e646f967605c532a
 
 server ftp://ftp.g10code.com/g10code/scratch