[svn] GnuPG - r4331 - trunk

[svn author wk]

Author: wk
Date: 2006-11-06 11:26:55 +0100 (Mon, 06 Nov 2006)
New Revision: 4331

Modified:
   trunk/NEWS
   trunk/README
   trunk/configure.ac
Log:
post release updates


Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-11-06 10:13:13 UTC (rev 4330)
+++ trunk/NEWS	2006-11-06 10:26:55 UTC (rev 4331)
@@ -1,3 +1,9 @@
+Noteworthy changes in version 2.0.0
+-------------------------------------------------
+
+ * First stable version of a GnuPG integrating OpenPGP and S/MIME.
+
+
 Noteworthy changes in version 1.9.95 (2006-11-06)
 -------------------------------------------------
 

Modified: trunk/README
===================================================================
--- trunk/README	2006-11-06 10:13:13 UTC (rev 4330)
+++ trunk/README	2006-11-06 10:26:55 UTC (rev 4331)
@@ -1,28 +1,22 @@
-                   The GNU Privacy Guard 2
-                  =========================
-                       Version 1.9.x
+                       The GNU Privacy Guard 2
+                      =========================
+                             Version 2.0
 
 
-GnuPG 1.9 is the future version of GnuPG; it is based on the gnupg-1.4
-code and the previous newpg package.  It will very soon lead to a
-GnuPG 2.0 release.
+GnuPG 2.0 is the stable version of GnupG integrating support for
+OpenPGP and S/MIME.  It does not conflict with an installed 1.4
+OpenPGP-only version.
 
-You should use this GnuPG version if you want to use the gpg-agent or
-gpgsm (the S/MIME variant of gpg).  Note that the gpg-agent is also
-helpful when using the standard gpg version (1.4.x).  There are no
-problems installing 1.4 and 1.9 alongside; in fact we suggest to do
-this.
 
-
 BUILD INSTRUCTIONS
 ==================
 
-GnuPG 1.9 depends on the following packages:
+GnuPG 2.0 depends on the following packages:
 
   libgpg-error (ftp://ftp.gnupg.org/gcrypt/libgpg-error/)
   libgcrypt    (ftp://ftp.gnupg.org/gcrypt/libgcrypt/)
   libksba      (ftp://ftp.gnupg.org/gcrypt/libksba/)
-  libassuan    (ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/)
+  libassuan    (ftp://ftp.gnupg.org/gcrypt/libassuan/)
   
 You also need the pinentry package for most function of GnuPG; however
 it is not a build requirement.  pinentry is available at

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-11-06 10:13:13 UTC (rev 4330)
+++ trunk/configure.ac	2006-11-06 10:26:55 UTC (rev 4331)
@@ -26,8 +26,8 @@
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.9.95])
-m4_define([my_issvn], [no])
+m4_define([my_version], [2.0.0])
+m4_define([my_issvn], [yes])
 
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \