From 11b5f1e40b4c1e4ddbfb93a8d75bfd55ef52a6df Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Fri, 13 Mar 2020 17:52:47 +0100 Subject: Update copyright year (#6186) * Update copyright year * Copyright: add notes for Lua and Jira modules --- COPYRIGHT | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) (limited to 'COPYRIGHT') diff --git a/COPYRIGHT b/COPYRIGHT index 606eb4849..eb916cc54 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,5 +1,5 @@ Pandoc -Copyright (C) 2006-2019 John MacFarlane +Copyright (C) 2006-2020 John MacFarlane With the exceptions noted below, this code is released under the [GPL], version 2 or later: @@ -37,7 +37,7 @@ The modules in the `pandoc-types` repository (Text.Pandoc.Definition, Text.Pandoc.Builder, Text.Pandoc.Generics, Text.Pandoc.JSON, Text.Pandoc.Walk) are licensed under the BSD 3-clause license: -Copyright (c) 2006-2019, John MacFarlane +Copyright (c) 2006-2020, John MacFarlane All rights reserved. @@ -73,29 +73,29 @@ Pandoc's templates (in `data/templates`) are dual-licensed as either GPL (v2 or higher, same as pandoc) or (at your option) the BSD 3-clause license. -Copyright (c) 2014--2019, John MacFarlane +Copyright (c) 2014--2020, John MacFarlane ---------------------------------------------------------------------- src/Text/Pandoc/Writers/Muse.hs -Copyright (C) 2017-2019 Alexander Krotov +Copyright (C) 2017-2020 Alexander Krotov Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Writers/Texinfo.hs -Copyright (C) 2008-2019 John MacFarlane and Peter Wang +Copyright (C) 2008-2020 John MacFarlane and Peter Wang Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Writers/OpenDocument.hs -Copyright (C) 2008-2019 Andrea Rossato and John MacFarlane +Copyright (C) 2008-2020 Andrea Rossato and John MacFarlane Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Writers/Org.hs -Copyright (C) 2010-2019 Puneeth Chaganti, John MacFarlane, and +Copyright (C) 2010-2020 Puneeth Chaganti, John MacFarlane, and Albert Krewinkel Released under the GNU General Public License version 2 or later. @@ -109,13 +109,13 @@ Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Readers/Docx.hs src/Text/Pandoc/Readers/Docx/* -Copyright (C) 2014-2019 Jesse Rosenthal +Copyright (C) 2014-2020 Jesse Rosenthal Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Readers/Textile.hs -Copyright (C) 2010-2019 Paul Rivier and John MacFarlane +Copyright (C) 2010-2020 Paul Rivier and John MacFarlane Released under the GNU General Public License version 2 or later. @@ -133,7 +133,7 @@ Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Readers/EPUB.hs -Copyright (C) 2014-2018 Matthew Pickering +Copyright (C) 2014-2020 Matthew Pickering and John MacFarlane Released under the GNU General Public License version 2 or later. @@ -141,19 +141,35 @@ Released under the GNU General Public License version 2 or later. src/Text/Pandoc/Readers/Org.hs src/Text/Pandoc/Readers/Org/* test/Tests/Readers/Org/* -Copyright (C) 2014-2019 Albert Krewinkel +Copyright (C) 2014-2020 Albert Krewinkel + +Released under the GNU General Public License version 2 or later. + +---------------------------------------------------------------------- +src/Text/Pandoc/Lua.hs +src/Text/Pandoc/Lua/* +test/lua/* +Copyright (C) 2017--2020 Albert Krewinkel and John MacFarlane + +Released under the GNU General Public License version 2 or later. + +---------------------------------------------------------------------- +src/Text/Pandoc/Readers/Jira.hs +src/Text/Pandoc/Writers/Jira.hs +test/Tests/Readers/Jira.hs +Copyright (C) 2019--2020 Albert Krewinkel Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- src/Text/Pandoc/Readers/FB2.hs -Copyright (C) 2018 Alexander Krotov +Copyright (C) 2018--2019 Alexander Krotov Released under the GNU General Public License version 2 or later. ---------------------------------------------------------------------- data/pandoc.lua -Copyright (C) 2017-2019 Albert Krewinkel +Copyright (C) 2017-2020 Albert Krewinkel Released under the GNU General Public License version 2 or later. @@ -167,7 +183,7 @@ Released under the Do What the Fuck You Want To Public License. ------------------------------------------------------------------------ Pandoc embeds a lua interpreter (via hslua). -Copyright © 1994–2017 Lua.org, PUC-Rio. +Copyright © 1994–2019 Lua.org, PUC-Rio. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -189,7 +205,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ------------------------------------------------------------------------ -The template pandoc.jats is Copyright 2013--15 Martin Fenner, +The template pandoc.jats is Copyright 2013--2015 Martin Fenner, released under GPL version 2 or later. The file data/jats.csl is derived from a csl file by Martin Fenner, -- cgit v1.2.3