Release 1.22.libgpg-error-1.22

* configure.ac: Set LT version to C18/A18/R0.

Signed-off-by: Werner Koch <wk@gnupg.org>

7 files changed, 48 insertions, 62 deletions

diff --git a/AUTHORS b/AUTHORS
index 2f89f6f..017fe97 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,72 +6,52 @@ Security related bug reports: security@gnupg.org
 License (library): LGPLv2.1+
 License (manual tools): GPLv2+ with exception
 
+Libgpg-error is free software.  See the files COPYING.LIB and COPYING
+for copying conditions.  License copyright years may be listed using
+range notation, e.g., 2000-2013, indicating that every year in the
+range, inclusive, is a copyrightable year that would otherwise be
+listed individually.
 
-Aron Xu <happyaron.xu at gmail.com>
- - TRANSLATION [zh_CN]
 
-Clytie Siddall <clytie at riverland.net.au>
- - TRANSLATION [vi]
-
-Daniel Nylander <po at danielnylander.se>
- - TRANSLATION [sv]
-
-David Prévot <david at tilapin.org>
- - TRANSLATION [fr]
-
-Felipe Castro <fefcas at gmail.com>
- - TRANSLATION [eo]
-
-Francesco Groccia <fgr at anche.no>
- - TRANSLATION [it]
-
-Freek de Kruijf <f.de.kruijf at gmail.com>
- - TRANSLATION [nl]
-
-g10 Code GmbH <code at g10code.com>
- - Design and implementation.
-
-Jakub Bogusz <qboosh at pld-linux.org>
- - TRANSLATION [pl]
-
-Joe Hansen <joedalton2 at yahoo.dk>
- - TRANSLATION [da]
-
-Laurentiu Buzdugan <lbuz at rolix.org>
- - TRANSLATION [ro]
-
-Petr Pisar <petr.pisar at atlas.cz>
- - TRANSLATION [cs]
-
-Robert Schiele <rschiele at uni-mannheim.de>
- - libgpg-error.spec
+Authors with a DCO
+==================
 
-Stephane Roy <sroy at j2n.net>
- - TRANSLATION [fr]
+We do not collect DCOs for libgpg-error.  As a supporting library for
+GnuPG, Libgcrypt, and GPGME a DCO for any of these projects is
+sufficient.
 
-Takeshi Hamasaki <hmatrjp at users.sourceforge.jp>
- - TRANSLATION [fp]
 
-Werner Koch <wk at gnupg.org>
- - TRANSLATION [de]
+Translators
+===========
 
-Yasuaki Taniguchi <yasuakit at gmail.com>
- - TRANSLATION [fp]
+cs    - Petr Pisar <petr.pisar at atlas.cz>
+da    - Joe Hansen <joedalton2 at yahoo.dk>
+de    - Werner Koch <wk at gnupg.org>
+eo    - Felipe Castro <fefcas at gmail.com>
+fr    - David Prévot <david at tilapin.org>
+        Stephane Roy <sroy at j2n.net>
+it    - Francesco Groccia <fgr at anche.no>
+jp    - Takeshi Hamasaki <hmatrjp at users.sourceforge.jp>
+        Yasuaki Taniguchi <yasuakit at gmail.com>
+nl    - Freek de Kruijf <f.de.kruijf at gmail.com>
+pl    - Jakub Bogusz <qboosh at pld-linux.org>
+ro    - Laurentiu Buzdugan <lbuz at rolix.org>
+sv    - Daniel Nylander <po at danielnylander.se>
+uk    - Yuri Chornoivan <yurchor at ukr.net>
+vi    - Clytie Siddall <clytie at riverland.net.au>
+zh_CN - Aron Xu <happyaron.xu at gmail.com>
 
-Yuri Chornoivan <yurchor at ukr.net>
- - TRANSLATION [uk]
 
+More credits
+============
 
-Authors with a DCO
-==================
-
-We do not collect DCOs for libgpg-error.  As a supporting library for
-GnuPG, Libgcrypt, and GPGME a DCO for any of these projects is
-sufficient.
+Robert Schiele <rschiele at uni-mannheim.de> wrote libgpg-error.spec.
 
+Thanks to Yukihiro Nakadaira for his public domain iconv
+implementation for Windows.
 
 
- Copyright 2003, 2004, 2005, 2006, 2007, 2013, 2014, 2015 g10 Code GmbH
+ Copyright 2003-2007, 2013-2016 g10 Code GmbH
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/NEWS b/NEWS
index b736ad2..ddade0a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,12 @@
-Noteworthy changes in version 1.22 (unreleased) [C17/A17/R_)
+Noteworthy changes in version 1.22 (2016-04-25) [C18/A18/R0)
 -----------------------------------------------
 
+ * New functions and macros to to provide iconv(3) on Windows.
 
- * Interface changes relative to the 1.20 release:
+ * Support for LeakSanitizer with the gpgrt_annotate_leaked_object
+   inline function.
+
+ * Interface changes relative to the 1.21 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  GPG_ERR_DB_CORRUPTED             NEW.
  gpgrt_annotate_leaked_object     NEW inline func.
diff --git a/configure.ac b/configure.ac
index 566ea62..784ac69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # configure.ac for libgpg-error
-# Copyright (C) 2003, 2004, 2006, 2010, 2013, 2014, 2015 g10 Code GmbH
+# Copyright (C) 2003, 2004, 2006, 2010, 2013, 2014, 2015, 2016 g10 Code GmbH
 #
 # This file is part of libgpg-error.
 #
@@ -51,8 +51,8 @@ AC_INIT([libgpg-error],[mym4_full_version],[https://bugs.gnupg.org])
 #   (Interfaces added:			AGE++)
 #   (Interfaces removed:		AGE=0)
 # Note that added error codes don't constitute an interface change.
-LIBGPG_ERROR_LT_CURRENT=17
-LIBGPG_ERROR_LT_AGE=17
+LIBGPG_ERROR_LT_CURRENT=18
+LIBGPG_ERROR_LT_AGE=18
 LIBGPG_ERROR_LT_REVISION=0
 ################################################
 
diff --git a/doc/errorref.txt b/doc/errorref.txt
index 22b78fc..bf27a81 100644
--- a/doc/errorref.txt
+++ b/doc/errorref.txt
@@ -263,6 +263,8 @@ GPG_ERR_CONFLICT		Conflicting use
 
     NTBTLS: - Function has already been called and may not be called
               again at this protocol state.
+    GNUPG:  - Returned by g13 when creating a new container on a device
+              which seems to be in use.
 
 
 71	GPG_ERR_INV_CIPHER_MODE		Invalid cipher mode
diff --git a/src/gpg-error.h.in b/src/gpg-error.h.in
index f0043f3..a79f6ba 100644
--- a/src/gpg-error.h.in
+++ b/src/gpg-error.h.in
@@ -1,5 +1,5 @@
 /* gpg-error.h - Public interface to libgpg-error.               -*- c -*-
- * Copyright (C) 2003, 2004, 2010, 2013, 2014, 2015 g10 Code GmbH
+ * Copyright (C) 2003, 2004, 2010, 2013, 2014, 2015, 2016 g10 Code GmbH
  *
  * This file is part of libgpg-error.
  *
diff --git a/src/version.c b/src/version.c
index d0c408d..64a9ac1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -39,7 +39,7 @@ cright_blurb (void)
   static const char blurb[] =
     "\n\n"
     "This is Libgpg-error " PACKAGE_VERSION " - An error code library\n"
-    "Copyright 2003, 2004, 2010, 2013, 2014, 2015 g10 Code GmbH\n"
+    "Copyright 2003, 2004, 2010, 2013, 2014, 2015, 2016 g10 Code GmbH\n"
     "\n"
     "(" BUILD_REVISION " " BUILD_TIMESTAMP ")\n"
     "\n\n";
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index 8a053a9..67599c6 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -39,7 +39,7 @@ BEGIN
             VALUE "FileDescription", "libgpg-error - Common error codes\0"
             VALUE "FileVersion", "@LIBGPG_ERROR_LT_CURRENT@.@LIBGPG_ERROR_LT_AGE@.@LIBGPG_ERROR_LT_REVISION@.@BUILD_REVISION@\0"
             VALUE "InternalName", "libgpg-error\0"
-            VALUE "LegalCopyright", "Copyright © 2013 g10 Code GmbH\0"
+            VALUE "LegalCopyright", "Copyright © 2016 g10 Code GmbH\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libgpg-error.dll\0"
             VALUE "PrivateBuild", "\0"