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

[scm-commit at wald.intevation.org]

Author: werner
Date: 2005-11-03 12:00:28 +0100 (Thu, 03 Nov 2005)
New Revision: 41

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/packages/download.sh
Log:
Integrated winPT.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-03 09:14:23 UTC (rev 40)
+++ trunk/ChangeLog	2005-11-03 11:00:28 UTC (rev 41)
@@ -1,5 +1,7 @@
 2005-11-03  Werner Koch  <wk at g10code.com>
 
+	* configure.ac (winpt): Made it a source package.
+
 	* configure.ac: Bail out if a required tool is missing.
 
 2005-11-02  Werner Koch  <wk at g10code.com>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2005-11-03 09:14:23 UTC (rev 40)
+++ trunk/Makefile.am	2005-11-03 11:00:28 UTC (rev 41)
@@ -19,6 +19,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
+DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc
 
 SUBDIRS = packages include src
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-03 09:14:23 UTC (rev 40)
+++ trunk/configure.ac	2005-11-03 11:00:28 UTC (rev 41)
@@ -30,7 +30,7 @@
 AC_CONFIG_SRCDIR(include/config.nsi.in)
 AC_CONFIG_MACRO_DIR(m4)
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 
@@ -78,9 +78,8 @@
 GPG4WIN_BPKG_GTK_DEV([gtk+], [atk pango glib libiconv gettext pkgconfig])
 GPG4WIN_BPKG_GTK_DEV([atk], [glib pkgconfig])
 GPG4WIN_BPKG_GTK_DEV([pango], [glib pkgconfig])
-#fixme: Theseare intermediate package.
+#fixme: These are intermediate package.
 GPG4WIN_BPKG_BINSRC([gpgee], [gnupg])
-GPG4WIN_BPKG_BINSRC([winpt], [gpgme gnupg])
 
 
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
@@ -88,7 +87,7 @@
 GPG4WIN_SPKG([gnupg])
 GPG4WIN_SPKG([gpgol], [gpgme])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
-#GPG4WIN_SPKG([winpt], [gpgme gnupg])
+GPG4WIN_SPKG([winpt], [gpgme gnupg])
 
 GPG4WIN_FINALIZE
 

Modified: trunk/packages/download.sh
===================================================================
--- trunk/packages/download.sh	2005-11-03 09:14:23 UTC (rev 40)
+++ trunk/packages/download.sh	2005-11-03 11:00:28 UTC (rev 41)
@@ -78,8 +78,7 @@
 #server_winpt="http://wald.intevation.org/frs/download.php"
 server_winpt="ftp://ftp.g10code.com/g10code/scratch"
 
-${WGET} -c ${server_winpt}/winpt-0.10.2_beta-bin.zip
-${WGET} -c ${server_winpt}/winpt-0.10.2_beta-src.zip
+${WGET} -c ${server_winpt}/winpt-0.11.0-cvs.tar.bz2
 
 # GPGee
 # Note: This is a temporary location