Post release version bump.

--

3 files changed, 51 insertions, 29 deletions

diff --git a/NEWS b/NEWS
index 9e64e4698..bf6e11c37 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Noteworthy changes in version 2.0.21 (unreleased)
+-------------------------------------------------
+
 Noteworthy changes in version 2.0.20 (2013-05-10)
 -------------------------------------------------
 
diff --git a/announce.txt b/announce.txt
index 4171d94e5..d4e11b16e 100644
--- a/announce.txt
+++ b/announce.txt
@@ -5,7 +5,7 @@ Mail-Followup-To: [email protected]
 Hello!
 
 We are pleased to announce the availability of a new stable GnuPG-2
-release:  Version 2.0.19.
+release:  Version 2.0.20.
 
 The GNU Privacy Guard (GnuPG) is GNU's tool for secure communication
 and data storage.  It can be used to encrypt data, create digital
@@ -14,7 +14,7 @@ framework for public key cryptography.  It includes an advanced key
 management facility and is compliant with the OpenPGP and S/MIME
 standards.
 
-GnuPG-2 has a different architecture than GnuPG-1 (e.g. 1.4.12) in
+GnuPG-2 has a different architecture than GnuPG-1 (e.g. 1.4.13) in
 that it splits up functionality into several modules.  However, both
 versions may be installed alongside without any conflict.  In fact,
 the gpg version from GnuPG-1 is able to make use of the gpg-agent as
@@ -29,24 +29,43 @@ GnuPG is distributed under the terms of the GNU General Public License
 also available for other Unices, Microsoft Windows and Mac OS X.
 
 
-What's New in 2.0.19
+What's New in 2.0.20
 ====================
 
- * GPG now accepts a space separated fingerprint as a user ID.  This
-   allows to copy and paste the fingerprint from the key listing.
+ * Decryption using smartcards keys > 3072 bit does now work.
 
- * GPG now uses the longest key ID available.  Removed support for the
-   original HKP keyserver which is not anymore used by any site.
+ * New meta option ignore-invalid-option to allow using the same
+   option file by other GnuPG versions.
 
- * Rebuild the trustdb after changing the option --min-cert-level.
+ * gpg: The hash algorithm is now printed for sig records in key listings.
 
- * Ukrainian translation.
+ * gpg: Skip invalid keyblock packets during import to avoid a DoS.
 
- * Honor option --cert-digest-algo when creating a cert.
+ * gpg: Correctly handle ports from DNS SRV records.
 
- * Emit a DECRYPTION_INFO status line.
+ * keyserver: Improve use of SRV records
 
- * Improved detection of JPEG files.
+ * gpg-agent: Avoid tty corruption when killing pinentry.
+
+ * scdaemon: Improve detection of card insertion and removal.
+
+ * scdaemon: Rename option --disable-keypad to --disable-pinpad.
+
+ * scdaemon: Better support for CCID readers.  Now, the internal CCID
+   driver supports readers without the auto configuration feature.
+
+ * scdaemon: Add pinpad input for PC/SC, if your reader has pinpad and
+   it supports variable length PIN input, and you specify
+   --enable-pinpad-varlen option.
+
+ * scdaemon: New option --enable-pinpad-varlen.
+
+ * scdaemon: Install into libexecdir to avoid accidental execution
+   from the command line.
+
+ * Support building using w64-mingw32.
+
+ * Assorted bug fixes.
 
 
 Getting the Software
@@ -55,7 +74,7 @@ Getting the Software
 Please follow the instructions found at http://www.gnupg.org/download/
 or read on:
 
-GnuPG 2.0.19 may be downloaded from one of the GnuPG mirror sites or
+GnuPG 2.0.20 may be downloaded from one of the GnuPG mirror sites or
 direct from ftp://ftp.gnupg.org/gcrypt/gnupg/ .  The list of mirrors
 can be found at http://www.gnupg.org/mirrors.html .  Note, that GnuPG
 is not available at ftp.gnu.org.
@@ -63,14 +82,14 @@ is not available at ftp.gnu.org.
 On the FTP server and its mirrors you should find the following files
 in the gnupg/ directory:
 
-  gnupg-2.0.19.tar.bz2 (4089k)
-  gnupg-2.0.19.tar.bz2.sig
+  gnupg-2.0.20.tar.bz2 (4186k)
+  gnupg-2.0.20.tar.bz2.sig
 
       GnuPG source compressed using BZIP2 and OpenPGP signature.
 
-  gnupg-2.0.18-2.0.19.diff.bz2 (305k)
+  gnupg-2.0.19-2.0.20.diff.bz2 (249k)
 
-      A patch file to upgrade a 2.0.18 GnuPG source tree.  This patch
+      A patch file to upgrade a 2.0.19 GnuPG source tree.  This patch
       does not include updates of the language files.
 
 Note, that we don't distribute gzip compressed tarballs for GnuPG-2.
@@ -85,9 +104,9 @@ the following ways:
 
  * If you already have a trusted version of GnuPG installed, you
    can simply check the supplied signature.  For example to check the
-   signature of the file gnupg-2.0.19.tar.bz2 you would use this command:
+   signature of the file gnupg-2.0.20.tar.bz2 you would use this command:
 
-     gpg --verify gnupg-2.0.19.tar.bz2.sig
+     gpg --verify gnupg-2.0.20.tar.bz2.sig
 
    This checks whether the signature file matches the source file.
    You should see a message indicating that the signature is good and
@@ -110,15 +129,15 @@ the following ways:
 
  * If you are not able to use an old version of GnuPG, you have to verify
    the SHA-1 checksum.  Assuming you downloaded the file
-   gnupg-2.0.19.tar.bz2, you would run the sha1sum command like this:
+   gnupg-2.0.20.tar.bz2, you would run the sha1sum command like this:
 
-     sha1sum gnupg-2.0.19.tar.bz2
+     sha1sum gnupg-2.0.20.tar.bz2
 
    and check that the output matches the first line from the
    following list:
 
-190c09e6688f688fb0a5cf884d01e240d957ac1f  gnupg-2.0.19.tar.bz2
-d5e5643dc5ecb4e5296f1a9500f850cfbfd0f8ff  gnupg-2.0.18-2.0.19.diff.bz2
+7ddfefa37ee9da89a8aaa8f9059d251b4cd02562  gnupg-2.0.20.tar.bz2
+4afefda1f42c7b8065e97c6df051fab2db552642  gnupg-2.0.19-2.0.20.diff.bz2
 
 
 Documentation
@@ -158,11 +177,11 @@ service directory at:
 
   http://www.gnupg.org/service.html
 
-Maintaining and improving GnuPG is costly.  For more than 10 years
-now, g10 Code, a German company owned and headed by GnuPG's principal
-author Werner Koch, is bearing the majority of these costs.  To help
-them carry on this work, they need your support.  Please consider to
-visit the GnuPG donation page at:
+The driving force behind the development of GnuPG is the company of
+its principal author, Werner Koch.  Maintenance and improvement of
+GnuPG and related software takes up most of their resources.  To
+allow him them continue his work he asks to either purchase a support
+contract, engage them for custom enhancements, or to donate money:
 
   http://g10code.com/gnupg-donation.html
 
diff --git a/configure.ac b/configure.ac
index 4752772b6..b85124c03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ min_automake_version="1.10"
 # (git tag -s gnupg-2.n.m) and run "./autogen.sh --force".  Please
 # bump the version number immediately *after* the release and do
 # another commit and push so that the git magic is able to work.
-m4_define([mym4_version], [2.0.20])
+m4_define([mym4_version], [2.0.21])
 
 # Below is m4 magic to extract and compute the git revision number,
 # the decimalized short revision number, a beta version string and a