diff --git a/AUTHORS b/AUTHORS index 59831ac4..f8cb309f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,10 +9,13 @@ License (software): LGPL-2.1-or-later License (manual+tools): GPL-3.0-or-later -GPGME is free software. See the files 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. +GPGME is free software. See the files COPYING.LESSER and COPYING for +copying conditions, , and LICENSES for notices about contributions +that require these additional notices to be distributed. 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. + List of Copyright holders ========================= @@ -23,6 +26,7 @@ List of Copyright holders Copyright (C) 2002 Klarälvdalens Datakonsult AB Copyright (C) 2004-2008 Igor Belyi Copyright (C) 2002 John Goerzen + Copyright (c) 2009 Dave Gamble Copyright (C) 2014, 2015 Martin Albrecht Copyright (C) 2015, 2018 Ben McGinnes Copyright (C) 2015, 2016, 2018 diff --git a/LICENSES b/LICENSES new file mode 100644 index 00000000..acfd6147 --- /dev/null +++ b/LICENSES @@ -0,0 +1,38 @@ +Additional license notices for GPGME. -*- org -*- + +This file contains the copying permission notices for various files in +the GPGME distribution which are not covered by the GNU Lesser +General Public License (LGPL) or the GNU General Public License (GPL). + +These notices all require that a copy of the notice be included +in the accompanying documentation and be distributed with binary +distributions of the code, so be sure to include this file along +with any binary distributions derived from the GNU C Library. + +* MIT License + + For files: + - cJSON.c, cJSON.h + +#+begin_quote + Copyright (c) 2009 Dave Gamble + + Permission is hereby granted, free of charge, to any person obtaining + a opy of this software and associated documentation files (the + "Software"), to eal in the Software without restriction, including + without limitation the ights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING ROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +#+end_quote diff --git a/Makefile.am b/Makefile.am index 7dcf2f32..914d418d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,7 +36,7 @@ DISTCHECK_CONFIGURE_FLAGS = EXTRA_DIST = autogen.sh autogen.rc gpgme.spec.in \ ChangeLog-2011 m4/ChangeLog-2011 \ - conf/whatisthis VERSION + conf/whatisthis VERSION LICENSES if RUN_GPG_TESTS