From 14b60616df95d76b91873a726861b58f3578182b Mon Sep 17 00:00:00 2001 From: Daniel Gnoutcheff Date: Wed, 15 Sep 2021 16:27:14 -0400 Subject: Licence information --- COPYING | 22 ++++++++++++++++++++++ LICENSE | 30 ------------------------------ app/Main.hs | 9 +++++++++ app/XMLParse.hs | 19 +++++++++++++++++-- fast-pandoc.cabal | 1 - 5 files changed, 48 insertions(+), 33 deletions(-) create mode 100644 COPYING delete mode 100644 LICENSE diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..c7f2118 --- /dev/null +++ b/COPYING @@ -0,0 +1,22 @@ +The file app/XMLParse.hs is derived from HaXml-1.25.5, which is: + (c) copyright 1998-1999 Malcolm Wallace and Colin Runciman + (c) copyright 2000-2013 Malcolm Wallace +and is licenced under the terms of the GNU Lesser General Public Licence (LGPL) +version 2.1 with the following exception (from HaXml's COPYRIGHT file): + +---- +As a relaxation of clause 6 of the LGPL, the copyright holders of this +library give permission to use, copy, link, modify, and distribute, +binary-only object-code versions of an executable linked with the +original unmodified Library, without requiring the supply of any +mechanism to modify or replace the Library and relink (clauses 6a, +6b, 6c, 6d, 6e), provided that all the other terms of clause 6 are +complied with. +---- + +All other files are: + + Copyright (C) 2021 Software Freedom Law Center + +Licenced under the terms of the GNU General Public Licence (GPL) version 3 or +(ar your option) any later version. diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 7caa388..0000000 --- a/LICENSE +++ /dev/null @@ -1,30 +0,0 @@ -Copyright Author name here (c) 2021 - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * 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. - - * Neither the name of Author name here nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"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 COPYRIGHT -OWNER OR CONTRIBUTORS 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. diff --git a/app/Main.hs b/app/Main.hs index 9da65af..59a9a79 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -1,4 +1,13 @@ {-# OPTIONS_GHC -fno-full-laziness #-} + +-- Pandoc Markdown rendering for IkiWiki, implemented as a "external" (XML-RPC) +-- plugin. +-- +-- Copyright (C) 2021 Software Freedom Law Center +-- +-- Licensed under the terms of the GNU General Public Licence (GPL) version 3 +-- or (at your option) any later version. + module Main (main) where import XMLParse -- Our slightly modified copy of Text.XML.HaXml.Parse diff --git a/app/XMLParse.hs b/app/XMLParse.hs index c23f834..58e750d 100644 --- a/app/XMLParse.hs +++ b/app/XMLParse.hs @@ -1,6 +1,21 @@ {-# OPTIONS -cpp #-} --- A copy of Text.XML.HaXml.Parse with seemingly obvious additions to the --- export list + +-- A copy of Text.XML.HaXml.Parse from HaXml-1.25.5, with seemingly obvious +-- additions to the export list. +-- +-- (c) copyright 1998-1999 Malcolm Wallace and Colin Runciman +-- (c) copyright 2000-2013 Malcolm Wallace +-- (c) copyright 2021 Software Freedom Law Center +-- Licensed under the terms of the GNU Lesser General Public Licence (LGPL) +-- version 2.1. +-- +-- As a relaxation of clause 6 of the LGPL, the copyright holders of this +-- library give permission to use, copy, link, modify, and distribute, +-- binary-only object-code versions of an executable linked with the original +-- unmodified Library, without requiring the supply of any mechanism to modify +-- or replace the Library and relink (clauses 6a, 6b, 6c, 6d, 6e), provided +-- that all the other terms of clause 6 are complied with. + module XMLParse ( -- * Parse a whole document diff --git a/fast-pandoc.cabal b/fast-pandoc.cabal index 8cd253a..44959f9 100644 --- a/fast-pandoc.cabal +++ b/fast-pandoc.cabal @@ -11,7 +11,6 @@ author: Daniel Gnoutcheff maintainer: gnoutchd@softwarefreedom.org copyright: 2021 Software Freedom Law Center license: GPL3 -license-file: LICENSE build-type: Simple extra-source-files: README.md -- cgit v1.2.3