[Gpg4win-commits] r533 - in trunk: . doc/website packages src

Mon Sep 17 18:29:42 CEST 2007

Author: werner
Date: 2007-09-17 18:29:42 +0200 (Mon, 17 Sep 2007)
New Revision: 533

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/README
   trunk/configure.ac
   trunk/doc/website/NEWS.last
   trunk/doc/website/versions.m4
   trunk/packages/packages.current
   trunk/src/Makefile.am
Log:
Updated website for 1.1.3.
Bumped version to 1.9 and activatyed the new packages.


Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2007-09-17 15:28:25 UTC (rev 532)
+++ trunk/ChangeLog	2007-09-17 16:29:42 UTC (rev 533)
@@ -1,5 +1,12 @@
 2007-09-17  Werner Koch  <wk at g10code.com>
 
+	* configure.ac: Set version to 1.9.0-svn.  Make gpgme depend on qt
+	again.
+	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Enable Qt again.
+	* packages/packages.current: Disable gpgee, enable gpgex.
+	
+2007-09-17  Werner Koch  <wk at g10code.com>
+
 	Released 0.9.92.
 
 	* src/Makefile.am (gpg4win_pkg_gpgme_configure): Disable Qt

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2007-09-17 15:28:25 UTC (rev 532)
+++ trunk/NEWS	2007-09-17 16:29:42 UTC (rev 533)
@@ -3,6 +3,11 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
+Noteworthy changes in version 1.9.0
+------------------------------------------------
+
+
+
 Noteworthy changes in version 1.1.3 (2007-09-17)
 ------------------------------------------------
 

Modified: trunk/README
===================================================================
--- trunk/README	2007-09-17 15:28:25 UTC (rev 532)
+++ trunk/README	2007-09-17 16:29:42 UTC (rev 533)
@@ -65,7 +65,16 @@
 access to the Sibversion, you may use the "online" target to actually
 update the website.
 
+Development Branches
+====================
 
+The old version of gpg4win (version < 1.2) is since 1.1.3 tracked by
+the SVN branch: branches/gpg4win-1-branch.  Only important fixes will
+go into this version.  The current version is in the SVN trunk starts
+as version 1.9 and will soon lead to version 2.0.
+
+
+
 Adding new packages to the installer:
 =====================================
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-09-17 15:28:25 UTC (rev 532)
+++ trunk/configure.ac	2007-09-17 16:29:42 UTC (rev 533)
@@ -26,8 +26,8 @@
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 # Right after a release the make target "copy-news" is to be called!
-m4_define([my_version], [1.1.3])
-m4_define([my_issvn], [no])
+m4_define([my_version], [1.9.0])
+m4_define([my_issvn], [yes])
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \
           ||echo 'Revision: 0')|sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))

Modified: trunk/doc/website/NEWS.last
===================================================================
--- trunk/doc/website/NEWS.last	2007-09-17 15:28:25 UTC (rev 532)
+++ trunk/doc/website/NEWS.last	2007-09-17 16:29:42 UTC (rev 533)
@@ -3,6 +3,27 @@
 # The version number given below are for the standard installers as
 # distributed by www.gpg4win.org.
 
+Noteworthy changes in version 1.1.3 (2007-09-17)
+------------------------------------------------
+
+(en) Update GpgOL to 0.9.92 and build with a fixed version of GPGME.
+(de) GpgOL wurde auf 0.9.92 aktualisiert und mit einer korrigierten Version von GPGME gebaut.
+
+~~~~~~~~~~~~~~~
+GnuPG:  1.4.7 
+GnuPG2: 2.0.7
+DirMngr: 1.0.2-svn267
+GPA:    0.7.6
+GPGol:  0.9.92
+GPGee:  1.3.1
+WinPT:  1.2.0
+Claws-Mail: 3.0.0-rc2
+Novices:        1.0.0
+Einsteiger:     2.0.2
+Durchblicker:   2.0.2
+~~~~~~~~~~~~~~~
+
+
 Noteworthy changes in version 1.1.2 (2007-08-16)
 ------------------------------------------------
 
@@ -23,7 +44,7 @@
 
 ~~~~~~~~~~~~~~~
 GnuPG:  1.4.7 
-GnuPG2: 2.0.6
+GnuPG2: 2.0.5
 DirMngr: 1.0.1
 GPA:    0.7.6
 GPGol:  0.9.91

Modified: trunk/doc/website/versions.m4
===================================================================
--- trunk/doc/website/versions.m4	2007-09-17 15:28:25 UTC (rev 532)
+++ trunk/doc/website/versions.m4	2007-09-17 16:29:42 UTC (rev 533)
@@ -1,30 +1,30 @@
-m4_define(`VERSION',`1.1.2')
+m4_define(`VERSION',`1.1.3')
 m4_define(`DOWNLOAD_URL',`http://ftp.gpg4win.org/gpg4win-VERSION.exe')
 m4_define(`DL_SIZE',`9.3 MByte')
 m4_define(`LDOWNLOAD_URL',`http://ftp.gpg4win.org/gpg4win-light-VERSION.exe')
-m4_define(`LDL_SIZE',`5.7 MByte')
-m4_define(`DL_DATE',`2007-08-16')
-m4_define(`SHA1_SRC',`348b2acfa497c8070b27f173ce39fcfe3af40a96')
-m4_define(`SHA1_EXE',`4db53c12cc7af540ddfbe7a9b2f1faddb529e6ed')
-m4_define(`SHA1_EXL',`e45d310d72c535caecbd243d2b13ca302ebcd532')
-m4_define(`SHA1_EXS',`099e75e1953f112bcbeae30bb99b774f8cf36c8e')
-m4_define(`MD5_SRC',`b64d0e33c24de5b70699ac1f0e370484')
-m4_define(`MD5_EXE',`3266b7534d014e1e3a7cc6804938db43')
-m4_define(`MD5_EXL',`9343e3ed51f7983cb66c86c29d16e4d1')
-m4_define(`MD5_EXS',`cb802cdda1d88fac52552c8ae71f5b67')
-m4_define(`LEN_SRC',`4443625')
-m4_define(`LEN_EXE',`9568603')
-m4_define(`LEN_EXL',`5914137')
-m4_define(`LEN_EXS',`59703577')
+m4_define(`LDL_SIZE',`5.8 MByte')
+m4_define(`DL_DATE',`2007-09-17')
+m4_define(`SHA1_SRC',`cac3c3da565c1cecefaabef75bbaac7baff8f741')
+m4_define(`SHA1_EXE',`1fb338f4e5fa06c72736e9ebaebea8fbc0e3618a')
+m4_define(`SHA1_EXL',`3487e36ddba913fb4bb8aed44e8740ed3dd8815d')
+m4_define(`SHA1_EXS',`aecf06075548c325ecd93651340418edf0b03c21')
+m4_define(`MD5_SRC',`ba5ca81edc7799931df4b5f4db2a4a68')
+m4_define(`MD5_EXE',`fe86ed13810896ec9fb8eea29401d14d')
+m4_define(`MD5_EXL',`4f0c0dbdf5affe94a4a7a37e4dab447e')
+m4_define(`MD5_EXS',`311b53aedc01ce25c31b619803113360')
+m4_define(`LEN_SRC',`4469205')
+m4_define(`LEN_EXE',`9717767')
+m4_define(`LEN_EXL',`5984378')
+m4_define(`LEN_EXS',`59790276')
 m4_define(`DLPAGE',`I18N(`EN',`download.html')`'I18N(`DE',`download-de.html')')
 m4_define(`MIRROR_IE_URL',`http://ftp.heanet.ie/mirrors/ftp.gpg4win.org/')
 m4_define(`MIRROR_NO_URL',`http://ftp.no.gpg4win.org/pub/gpg4win/')
 m4_define(`SOFTWARE',`
 I18N(`EN', `<a href="http://www.gnupg.org/">GnuPG</a>')I18N(`DE', `<a href="http://www.gnupg.de/">GnuPG</a>') 1.4.7
-I18N(`EN', `<a href="http://www.gnupg.org/">GnuPG2</a>')I18N(`DE', `<a href="http://www.gnupg.de/">GnuPG2</a>') 2.0.6
+I18N(`EN', `<a href="http://www.gnupg.org/">GnuPG2</a>')I18N(`DE', `<a href="http://www.gnupg.de/">GnuPG2</a>') 2.0.7
 <a href="http://winpt.wald.intevation.org/">WinPT</a> 1.2.0
 I18N(`EN', `<a href="http://www.gnupg.org/related_software/gpa/index.html">GPA</a>')I18N(`DE', `<a href="http://www.gnupg.de/related_software/gpa/index.html">GPA</a>') 0.7.6
-<a href="http://www.g10code.de/p-gpgol.html">GPGol</a> 0.9.91
+<a href="http://www.g10code.de/p-gpgol.html">GPGol</a> 0.9.92
 <a href="http://gpgee.excelcia.org/">GPGee</a> 1.3.1
 <a href="http://www.claws-mail.org/">Claws Mail</a> 3.0.0-rc2
 I18N(`EN', `<a href="/handbuecher/novices.html">Gpg4win for Novices</a> 1.0.0')I18N(`DE', `<a href="/handbuecher/einsteiger.html">Gpg4win für Einsteiger</a> 2.0.2')

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2007-09-17 15:28:25 UTC (rev 532)
+++ trunk/packages/packages.current	2007-09-17 16:29:42 UTC (rev 533)
@@ -194,10 +194,10 @@
 #    zip ../GPGee-1.2.3-bin.zip GPGee/*
 # server ftp://ftp.gnupg.org/gcrypt/gpgee
 #
-file GPGee-1.3.1-noinstaller.zip
-chk  6e44bbf61776e0a6c8714a514fa39489e94c0179
-file GPGee-1.3.1-source.zip
-chk  b04fa9ea81fc77844c7aa2e3eda042d819d8e9f1
+#file GPGee-1.3.1-noinstaller.zip
+#chk  6e44bbf61776e0a6c8714a514fa39489e94c0179
+#file GPGee-1.3.1-source.zip
+#chk  b04fa9ea81fc77844c7aa2e3eda042d819d8e9f1
 
 
 #
@@ -211,11 +211,11 @@
 # GpgEX
 #
 
-#server ftp://ftp.g10code.com/g10code/scratch
-#
-#file gpgex-0.0.0-svn18.tar.bz2
-#chk  825320edd689cd221f189ec308531817663295fc
+server ftp://ftp.g10code.com/g10code/scratch
 
+file gpgex-0.0.0-svn18.tar.bz2
+chk  825320edd689cd221f189ec308531817663295fc
+
 #
 # Pth emulation
 #

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-09-17 15:28:25 UTC (rev 532)
+++ trunk/src/Makefile.am	2007-09-17 16:29:42 UTC (rev 533)
@@ -153,15 +153,14 @@
 # around the lack of cross compilation support in qt-dev.
 gpg4win_pkg_gpgme_configure = --silent \
   --with-gpg-error-prefix=$(idir) --enable-static \
-  --enable-w32-glib LDFLAGS=-L$(idir)/lib 
+  --enable-w32-glib LDFLAGS=-L$(idir)/lib \
+  --enable-w32-qt \
+  QT4_CORE_CFLAGS=\"-DQT_LARGEFILE_SUPPORT -DQT_DLL \
+                   -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_THREAD_SUPPORT \
+                   -I$(idir)/include/QtCore -I$(idir)/include \
+		   -I$(idir)/mkspecs/win32-g++\" \
+  QT4_CORE_LIBS=\"-L$(idir)/lib -lQtCore4\"
 
-#  --enable-w32-qt \
-#  QT4_CORE_CFLAGS=\"-DQT_LARGEFILE_SUPPORT -DQT_DLL \
-#                   -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_THREAD_SUPPORT \
-#                   -I$(idir)/include/QtCore -I$(idir)/include \
-#		   -I$(idir)/mkspecs/win32-g++\" \
-#  QT4_CORE_LIBS=\"-L$(idir)/lib -lQtCore4\"
-
 gpg4win_pkg_gpa_configure = --silent \
   --with-libiconv-prefix=$(idir) --with-libintl-prefix=$(idir) \
   --with-gpgme-prefix=$(idir) --with-zlib=$(idir)

