copyright: Update to new upstream version

Also, remove the lang/cl/mkerrcodes.awk section because we don't ship
Common Lisp support.

1 files changed, 115 insertions, 39 deletions

diff --git a/copyright b/copyright
index 6bf7d47..b9b0b76 100644
--- a/copyright
+++ b/copyright
@@ -4,9 +4,11 @@ Upstream Source
 In General
 ----------
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2010, 2012, 2013 g10 Code GmbH
+Copyright (C) 1997-2017 Werner Koch
+Copyright (C) 1998-2001, 2003-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2018 g10 Code GmbH
 
-This file is part of libgpg-error.
+This file is part of libgpg-error (aka libgpgrt).
 
 libgpg-error is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public License
@@ -19,9 +21,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
-License along with libgpg-error; if not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+License along with this program; if not, see <https://www.gnu.org/licenses/>.
+SPDX-License-Identifier: LGPL-2.1+
 
 On this system, a copy of the GNU Lesser General Public License may be found at
 <file:///usr/share/common-licenses/LGPL-2.1>.
@@ -49,6 +50,64 @@ USA.
 On this system, a copy of the GNU Library General Public License may be found at
 <file:///usr/share/common-licenses/LGPL-2>.
 
+src/estream-printf.c, src/estream-printf.h, src/estream.c
+---------------------------------------------------------
+
+Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+              2011, 2012, 2014, 2015, 2016, 2017 g10 Code GmbH
+
+This file is part of Libestream.
+
+Libestream is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation; either version 2.1 of
+the License, or (at your option) any later version.
+
+Libestream is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with Libestream; if not, see <https://www.gnu.org/licenses/>.
+
+ALTERNATIVELY, Libestream may be distributed under the terms of the
+following license, in which case the provisions of this license are
+required INSTEAD OF the GNU General Public License. If you wish to
+allow use of your version of this file only under the terms of the
+GNU General Public License, and not to allow others to use your
+version of this file under the terms of the following license,
+indicate your decision by deleting this paragraph and the license
+below.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, and the entire permission notice in its entirety,
+   including the disclaimer of warranties.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior
+   written permission.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+On this system, a copy of the GNU Lesser General Public License may be found at
+<file:///usr/share/common-licenses/LGPL-2.1>.
+
 src/mkerrnos.awk, src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk,
 src/mkheader.awk, src/mkstrtable.awk
 -------------------------------------------------------------------------------
@@ -101,54 +160,71 @@ any notice of this special exception to the GPL from your modified version.
 On this system, a copy of the GNU General Public License may be found at
 <file:///usr/share/common-licenses/GPL-2>.
 
-lang/cl/mkerrcodes.awk
-----------------------
+src/gpg-error-config.in, src/gpg-error.m4, src/gpgrt.m4
+-------------------------------------------------------
 
-Copyright (C) 2004, 2005, 2006 g10 Code GmbH
+Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2011, 2014, 2017 g10 Code GmbH
 
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2 of
-the License, or (at your option) any later version.
+This file is free software; as a special exception the author gives
+unlimited permission to copy and/or distribute it, with or without
+modifications, as long as this notice is preserved.
+
+This file is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+SPDX-License-Identifier: FSFULLR
+
+src/doc/yat2m.c
+---------------
+
+     Copyright (C) 2005, 2013, 2015, 2016, 2017 g10 Code GmbH
+     Copyright (C) 2006, 2008, 2011 Free Software Foundation, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+along with this program; if not, see <https://www.gnu.org/licenses/>.
 
-As a special exception, g10 Code GmbH gives unlimited permission to
-copy, distribute and modify the lisp source files that are the output
-of mkerrcodes.awk.  You need not follow the terms of the GNU General
-Public License when using or distributing such scripts, even though
-portions of the text of mkerrcodes.awk appear in them.  The GNU
-General Public License (GPL) does govern all other use of the material
-that constitutes the mkerrcodes.awk program.
+On this system, a copy of the GNU General Public License may be found at
+<file:///usr/share/common-licenses/GPL-3>.
 
-Certain portions of the mkerrcodes.awk source text are designed to be
-copied (in certain cases, depending on the input) into the output of
-mkerrcodes.awk.  We call these the "data" portions.  The rest of the
-mkerrcodes.awk source text consists of comments plus executable code
-that decides which of the data portions to output in any given case.
-We call these comments and executable code the "non-data" portions.
-mkerrcodes.awk never copies any of the non-data portions into its output.
+doc/gpgrt.texi, doc/gpgrt.info
+------------------------------
 
-This special exception to the GPL applies to versions of mkerrcodes.awk
-released by g10 Code GmbH.  When you make and distribute a modified version
-of mkerrcodes.awk, you may extend this special exception to the GPL to
-apply to your modified version as well, *unless* your modified version
-has the potential to copy into its output some of the text that was the
-non-data portion of the version that you started with.  (In other words,
-unless your change moves or copies text from the non-data portions to the
-data portions.)  If your modification has such potential, you must delete
-any notice of this special exception to the GPL from your modified version.
+Copyright (C) 2014 g10 Code GmbH
+
+     Permission is granted to copy, distribute and/or modify this
+     document under the terms of the GNU General Public License as
+     published by the Free Software Foundation; either version 2 of the
+     License, or (at your option) any later version.  The text of the
+     license can be found in the section entitled "GNU General Public
+     License".
 
 On this system, a copy of the GNU General Public License may be found at
 <file:///usr/share/common-licenses/GPL-2>.
 
+po/da.po
+--------
+
+Copyright (C) 2014 g10 Code GmbH og nedenstående oversættere.
+This file is distributed under the same license as the libgpg-error package.
+Joe Hansen <joedalton2@yahoo.dk>, 2012, 2014.
+
+po/zh_TW.po
+-----------
+
+Copyright (C) 2014 Jedi Lin
+This file is distributed under the same license as the libngpg-error package.
+
 
 Distribution Packaging
 ======================