preparing a release candidate

ChangeLog

@@ -1,3 +1,9 @@
+2010-02-18  Werner Koch  <wk@g10code.com>
+
+	Release 2.0.15rc1.
+
+	* configure.ac: Remove double check for libassuan.
+
 2010-02-11  Marcus Brinkmann  <marcus@g10code.de>
 
 	From trunk 2009-10-16:

NEWS

@@ -6,6 +6,8 @@ Noteworthy changes in version 2.0.15 (unreleased)
  * Fixes a regression in 2.0.14 which prevented unprotection of new
    or changed gpg-agent passphrases.
 
+ * Make use of libassuan 2.0 which is available as a DSO.
+
 
 Noteworthy changes in version 2.0.14 (2009-12-21)
 -------------------------------------------------

README

@@ -2,8 +2,8 @@
                       =========================
                              Version 2.0
 
-      Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-        2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+        2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 
 INTRODUCTION
@@ -31,10 +31,10 @@ BUILD INSTRUCTIONS
 
 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 < 2.0 (ftp://ftp.gnupg.org/gcrypt/libassuan/)
+  libgpg-error     (ftp://ftp.gnupg.org/gcrypt/libgpg-error/)
+  libgcrypt        (ftp://ftp.gnupg.org/gcrypt/libgcrypt/)
+  libksba          (ftp://ftp.gnupg.org/gcrypt/libksba/)
+  libassuan >= 2.0 (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

configure.ac

@@ -1,6 +1,6 @@
 # configure.ac - for GnuPG 2.0
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-#               2006, 2007, 2008 Free Software Foundation, Inc.
+#               2006, 2007, 2008, 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GnuPG.
 # 
@@ -24,8 +24,8 @@ min_automake_version="1.10"
 # 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], [2.0.15])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [2.0.15rc1])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
@@ -43,7 +43,7 @@ NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.4.0
 
 NEED_LIBASSUAN_API=2
-NEED_LIBASSUAN_VERSION=1.1.0
+NEED_LIBASSUAN_VERSION=2.0.0
 
 NEED_KSBA_API=1
 NEED_KSBA_VERSION=1.0.2
@@ -613,9 +613,6 @@ AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION",
 AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
                   have_libassuan=yes,have_libassuan=no)
 if test "$have_libassuan" = "yes"; then
-  have_libassuan=no
-  AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
-                    have_libassuan=yes,have_libassuan=no)	
   AC_DEFINE_UNQUOTED(GNUPG_LIBASSUAN_VERSION, "$libassuan_version",
             [version of the libbassuan library])
 fi

po/de.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.14\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2010-02-17 18:08+0100\n"
+"POT-Creation-Date: 2010-02-18 09:22+0100\n"
 "PO-Revision-Date: 2010-02-17 18:11+0100\n"
 "Last-Translator: Werner Koch <wk@gnupg.org>\n"
 "Language-Team: German <de@li.org>\n"