Copyright notice updates et al.

--

4 files changed, 15 insertions, 13 deletions

diff --git a/AUTHORS b/AUTHORS
index 32766a6d3..05c680a0b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,7 +5,7 @@ Repository: git://git.gnupg.org/gnupg.git
 Bug reports: https://bugs.gnupg.org
 Security related bug reports: <[email protected]>
 Maintainer: Werner Koch <[email protected]>
-License: GPLv3+
+License: GPL-3.0-or-later
 
 GnuPG is free software.  See the files COPYING for copying conditions.
 License copyright years may be listed using range notation, e.g.,
@@ -16,8 +16,8 @@ List of Copyright holders
 =========================
 
   Copyright (C) 1997-2019 Werner Koch
-  Copyright (C) 1994-2019 Free Software Foundation, Inc.
-  Copyright (C) 2003-2013,2015-2019 g10 Code GmbH
+  Copyright (C) 1994-2020 Free Software Foundation, Inc.
+  Copyright (C) 2003-2020 g10 Code GmbH
   Copyright (C) 2002 Klarälvdalens Datakonsult AB
   Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper <[email protected]>
   Copyright (C) 1994 X Consortium
diff --git a/README b/README
index 85639a4b1..c039e2dc7 100644
--- a/README
+++ b/README
@@ -3,7 +3,8 @@
                              Version 2.2
 
           Copyright 1997-2019 Werner Koch
-          Copyright 1998-2019 Free Software Foundation, Inc.
+          Copyright 1998-2020 Free Software Foundation, Inc.
+          Copyright 2003-2020 g10 Code GmbH
 
 
 * INTRODUCTION
@@ -236,13 +237,13 @@
   authors and we try to answer questions when time allows us.
 
   Commercial grade support for GnuPG is available; for a listing of
-  offers see https://gnupg.org/service.html .  Maintaining and
-  improving GnuPG requires a lot of time.  Since 2001, g10 Code GmbH,
-  a German company owned and headed by GnuPG's principal author Werner
-  Koch, is bearing the majority of these costs.  To keep GnuPG in a
-  healthy state, they need your support.
-
-  Please consider to donate at https://gnupg.org/donate/ .
+  offers see https://gnupg.org/service.html.  Maintaining and
+  improving GnuPG requires a lot of time.  Since 2001 g10 Code GmbH, a
+  German company owned and headed by GnuPG's principal author Werner
+  Koch and Gpg4win maintainer Andre Heinecke, is bearing the majority
+  of these costs.  Under the brand https://gnupg.com g10 Code GmbH
+  does now provide commercial offers.  Donations are also appreciated;
+  see https://gnupg.org/donate/ .
 
 
 # This file is Free Software; as a special exception the authors gives
diff --git a/common/argparse.c b/common/argparse.c
index 8f2c71116..c29f8e9da 100644
--- a/common/argparse.c
+++ b/common/argparse.c
@@ -71,7 +71,7 @@
 #else /* Used by GnuPG  */
 
 # define ARGPARSE_GPL_VERSION      3
-# define ARGPARSE_CRIGHT_STR "Copyright (C) 2019 Free Software Foundation, Inc."
+# define ARGPARSE_CRIGHT_STR "Copyright (C) 2020 Free Software Foundation, Inc."
 
 #endif /*GNUPG_MAJOR_VERSION*/
 
diff --git a/configure.ac b/configure.ac
index 14dae1bf8..f3c9863ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
-# configure.ac - for GnuPG 2.1
+# configure.ac - for GnuPG 2.2
 # Copyright (C) 1998-2019 Free Software Foundation, Inc.
 # Copyright (C) 1998-2019 Werner Koch
+# Copyright (C) 2003-2020 g10 Code GmbH
 #
 # This file is part of GnuPG.
 #