Update copyright info

--

4 files changed, 78 insertions, 28 deletions

diff --git a/AUTHORS b/AUTHORS
index 7d2e7c3..2219f35 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,14 @@ Security related bug reports: security@gnupg.org
 License (library): LGPLv2.1+
 License (manual): GPLv3+
 
+Libassuan is free software.  See below for details.  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.
+
+
+Authors with a FSF copyright assignment
+=======================================
 
 Werner Koch  <wk@gnupg.org>
  - Initial code.
@@ -22,15 +30,39 @@ Ben Kibbey  <bjk@luxsci.net>  Assigns Past and Future Changes For GnuPG.
  - Fixes and new features
 
 
-DCO:
+Authors with a DCO
+==================
+
 
 
+Notes:
+======
 
 Libassuan was orginally part of NewPG, a temporary fork of GnuPG, and
 later split of into a separate library.
 
 
- Copyright 2003, 2007, 2008, 2011, 2013 Free Software Foundation, Inc.
+Copyright
+=========
+
+The Libassuan code distributed under the GNU Lesser General Public
+License, version 2.1 or later.  The manual is distributed under the
+GNU General Public License, Version 3 or later.
+
+List of Copyright holders
+=========================
+
+  Copyright (C) 1992-2013 Free Software Foundation, Inc.
+  Copyright (C) 1994 X Consortium
+  Copyright (C) 2000 Werner Koch (dd9jn)
+  Copyright (C) 2001-2014 g10 Code GmbH
+  Copyright (C) 2004 Simon Josefsson
+
+
+==========
+
+ Copyright 2003-2013 Free Software Foundation, Inc.
+ Copyright (C) 2013-2014  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/README b/README
index 089b84b..defb427 100644
--- a/README
+++ b/README
@@ -1,34 +1,52 @@
                               Libassuan
                              ===========
 
-This is the IPC library used by GnuPG 2, GPGME and a few other
-packages.
+    Copyright (C) 2001-2013 Free Software Foundation, Inc.
+    Copyright (C) 2001-2014 g10 Code GmbH
 
-See COPYING.LIB on how to share, modify and distribute the software
-itself (LGPLv2.1+) and COPYING for the documentation (GPLv3+).
 
-Please send bug report to the gnupg-devel mailing list or enter them
-into the gnupg bug tracker at http://bugs.gnupg.org using the
-category "libassuan".
+    This is a general purpose IPC library which is for example used
+    GnuPG, GPGME and some other software.
 
-The primary FTP site is ftp://ftp.gnupg.org/gcrypt/libassuan.
+    See COPYING.LIB on how to share, modify and distribute the
+    software itself (LGPLv2.1+) and COPYING for the documentation
+    (GPLv3+).
 
+    Please send bug report to the gnupg-devel mailing list or enter
+    them into the gnupg bug tracker at http://bugs.gnupg.org using the
+    category "libassuan".
 
+    The primary FTP site is ftp://ftp.gnupg.org/gcrypt/libassuan.
 
-Notes for Windows CE:
-----------------------
 
-Libassuan supports WindowsCE (tested with WindowsMobile 6.5).  To
-install it, copy libassuan-0.dll into a location where DLL are found
-and install the included gpgcedev driver: First copy "gpgcedev.dll"
-into the root directory, second run the included program gpgcemgr on
-the device: "gpgcemgr --register".  This creates the necessary
-registry keys.  In case the copy step fails, the driver may still be
-in use: Close all applications using that driver, run "gpgcemgr
---deactivate" to deactivate the running driver and try again.
+    Notes for Windows CE:
+    ----------------------
 
-Registry keys created by "gpgcemgr --register" are:
+    Libassuan supports WindowsCE (tested with WindowsMobile 6.5).  To
+    install it, copy libassuan-0.dll into a location where DLL are found
+    and install the included gpgcedev driver: First copy "gpgcedev.dll"
+    into the root directory, second run the included program gpgcemgr on
+    the device: "gpgcemgr --register".  This creates the necessary
+    registry keys.  In case the copy step fails, the driver may still be
+    in use: Close all applications using that driver, run "gpgcemgr
+    --deactivate" to deactivate the running driver and try again.
 
-   Drivers\\GnuPG_Device\dll    -> "gpgcedev.dll"
-   Drivers\\GnuPG_Device\prefix -> "GPG"
-   Drivers\\GnuPG_Device\Index  -> 1      (dword)
+    Registry keys created by "gpgcemgr --register" are:
+
+       Drivers\\GnuPG_Device\dll    -> "gpgcedev.dll"
+       Drivers\\GnuPG_Device\prefix -> "GPG"
+       Drivers\\GnuPG_Device\Index  -> 1      (dword)
+
+
+    Contact
+    -------
+
+    See the file AUTHORS.
+
+    Commercial grade support for Libassuan and GnuPG is available; for
+    a listing of offers see https://www.gnupg.org/service.html .
+    Maintaining and improving this software is costly.  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 help them carry on this work, they need your support.
+    See https://gnupg.org/donate/ .
diff --git a/src/assuan.h.in b/src/assuan.h.in
index 089415c..d074a9f 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -1,6 +1,6 @@
 /* assuan.h - Definitions for the Assuan IPC library             -*- c -*-
-   Copyright (C) 2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010,
-                 2011, 2013  Free Software Foundation, Inc.
+   Copyright (C) 2001-2013 Free Software Foundation, Inc.
+   Copyright (C) 2001-2014 g10 Code GmbH
 
    This file is part of Assuan.
 
diff --git a/src/sysutils.c b/src/sysutils.c
index 6951ceb..0eb5d1c 100644
--- a/src/sysutils.c
+++ b/src/sysutils.c
@@ -45,8 +45,8 @@ _assuan_sysutils_blurb (void)
   static const char blurb[] =
     "\n\n"
     "This is Libassuan " PACKAGE_VERSION " - The GnuPG IPC Library\n"
-    "Copyright 2000, 2002, 2003, 2004, 2007, 2008, 2009,\n"
-    "          2010, 2011, 2013 Free Software Foundation, Inc.\n"
+    "Copyright 2001-2013 Free Software Foundation, Inc.\n"
+    "Copyright 2001-2014 g10 Code GmbH\n"
     "\n"
     "(" BUILD_REVISION " " BUILD_TIMESTAMP ")\n"
     "\n\n";