[svn] GnuPG - r5268 - in branches/STABLE-BRANCH-2-0: . po

svn author wk cvs at cvs.gnupg.org
Thu Feb 18 10:52:33 CET 2010


Author: wk
Date: 2010-02-18 10:52:28 +0100 (Thu, 18 Feb 2010)
New Revision: 5268

Modified:
   branches/STABLE-BRANCH-2-0/ChangeLog
   branches/STABLE-BRANCH-2-0/NEWS
   branches/STABLE-BRANCH-2-0/README
   branches/STABLE-BRANCH-2-0/configure.ac
   branches/STABLE-BRANCH-2-0/po/be.po
   branches/STABLE-BRANCH-2-0/po/ca.po
   branches/STABLE-BRANCH-2-0/po/cs.po
   branches/STABLE-BRANCH-2-0/po/da.po
   branches/STABLE-BRANCH-2-0/po/de.po
   branches/STABLE-BRANCH-2-0/po/el.po
   branches/STABLE-BRANCH-2-0/po/eo.po
   branches/STABLE-BRANCH-2-0/po/es.po
   branches/STABLE-BRANCH-2-0/po/et.po
   branches/STABLE-BRANCH-2-0/po/fi.po
   branches/STABLE-BRANCH-2-0/po/fr.po
   branches/STABLE-BRANCH-2-0/po/gl.po
   branches/STABLE-BRANCH-2-0/po/hu.po
   branches/STABLE-BRANCH-2-0/po/id.po
   branches/STABLE-BRANCH-2-0/po/it.po
   branches/STABLE-BRANCH-2-0/po/ja.po
   branches/STABLE-BRANCH-2-0/po/nb.po
   branches/STABLE-BRANCH-2-0/po/pl.po
   branches/STABLE-BRANCH-2-0/po/pt.po
   branches/STABLE-BRANCH-2-0/po/pt_BR.po
   branches/STABLE-BRANCH-2-0/po/ro.po
   branches/STABLE-BRANCH-2-0/po/ru.po
   branches/STABLE-BRANCH-2-0/po/sk.po
   branches/STABLE-BRANCH-2-0/po/sv.po
   branches/STABLE-BRANCH-2-0/po/tr.po
   branches/STABLE-BRANCH-2-0/po/zh_CN.po
   branches/STABLE-BRANCH-2-0/po/zh_TW.po
Log:
preparing a release candidate


Modified: branches/STABLE-BRANCH-2-0/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/ChangeLog	2010-02-17 19:03:37 UTC (rev 5267)
+++ branches/STABLE-BRANCH-2-0/ChangeLog	2010-02-18 09:52:28 UTC (rev 5268)
@@ -1,3 +1,9 @@
+2010-02-18  Werner Koch  <wk at g10code.com>
+
+	Release 2.0.15rc1.
+
+	* configure.ac: Remove double check for libassuan.
+
 2010-02-11  Marcus Brinkmann  <marcus at g10code.de>
 
 	From trunk 2009-10-16:

Modified: branches/STABLE-BRANCH-2-0/NEWS
===================================================================
--- branches/STABLE-BRANCH-2-0/NEWS	2010-02-17 19:03:37 UTC (rev 5267)
+++ branches/STABLE-BRANCH-2-0/NEWS	2010-02-18 09:52:28 UTC (rev 5268)
@@ -6,7 +6,9 @@
  * 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)
 -------------------------------------------------
 

Modified: branches/STABLE-BRANCH-2-0/README
===================================================================
--- branches/STABLE-BRANCH-2-0/README	2010-02-17 19:03:37 UTC (rev 5267)
+++ branches/STABLE-BRANCH-2-0/README	2010-02-18 09:52:28 UTC (rev 5268)
@@ -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 @@
 
 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

Modified: branches/STABLE-BRANCH-2-0/configure.ac
===================================================================
--- branches/STABLE-BRANCH-2-0/configure.ac	2010-02-17 19:03:37 UTC (rev 5267)
+++ branches/STABLE-BRANCH-2-0/configure.ac	2010-02-18 09:52:28 UTC (rev 5268)
@@ -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 @@
 # 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_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_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

Modified: branches/STABLE-BRANCH-2-0/po/be.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/ca.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/cs.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/da.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/de.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/el.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/eo.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/es.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/et.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/fi.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/fr.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/gl.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/hu.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/id.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/it.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/ja.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/nb.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/pl.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/pt.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/pt_BR.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/ro.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/ru.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/sk.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/sv.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/tr.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/zh_CN.po  [not shown]
Modified: branches/STABLE-BRANCH-2-0/po/zh_TW.po  [not shown]




More information about the Gnupg-commits mailing list