[r-cran-markdown] 02/02: copyright completed

[Joost van Baal]

This is an automated email from the git hooks/post-receive script.

joostvb pushed a commit to branch master
in repository r-cran-markdown.

commit 768408259d077bb59acf7846ad888aa1ac1e0d51
Author: Joost van Baal-Ilić <joostvb at janacopoulos.mdcc.cx>
Date:   Tue Feb 2 13:00:40 2016 +0100

    copyright completed
---
 debian/changelog |  1 -
 debian/control   |  8 ++++++++
 debian/copyright | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 216460a..46374ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 r-cran-markdown (0.7.7-1) unstable; urgency=low
 
   * UNRELEASED.
-  * FIXME: copyright
   * Private release, for Tilburg University.
 
  -- Joost van Baal-Ilić <joostvb at debian.org>  Tue, 02 Feb 2016 12:32:00 +0100
diff --git a/debian/control b/debian/control
index d00026f..324c6a8 100644
--- a/debian/control
+++ b/debian/control
@@ -16,3 +16,11 @@ Description: GNU R package providing R bindings to the Sundown Markdown renderin
  Provides R bindings to the Sundown Markdown rendering library by Vicent Marti e.a.,
  based upon work by Natacha Porté.  Markdown is a plain-text formatting syntax that can
  be converted to XHTML or other formats.
+ .
+ The R function `markdownToHTML` renders a markdown file to HTML. Options
+ controlling HTML output and supported markdown extensions can be optionally
+ specified.
+ .
+ The package also exports the underlying Sundown C extension API which
+ enables creating and calling custom renderers using the `renderMarkdown`
+ function.
diff --git a/debian/copyright b/debian/copyright
index 1d96fbf..a4d3421 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,22 +3,62 @@ Upstream-Name: markdown
 Upstream-Contact: Yihui Xie <xie at yihui.name>
 Source: https://cran.r-project.org/web/packages/markdown
 
-FIXME
-
 Files: *
-Copyright: Yihui Xie <xie at yihui.name>
+Copyright: Yihui Xie, JJ Allaire, Jeffrey Horner, Vicent Marti, and Natacha Porte
 License: GPL-2
 
 Files: debian/*
-Copyright: 2015 Tilburg University https://tilburguniversity.edu/
+Copyright: 2016 Tilburg University https://tilburguniversity.edu/
 Comment: author: Joost van Baal-Ilić
-License: GPL-3
+License: GPL-2
+
+Files: src/*
+Copyright: 2009, Natacha Porté; 2011, Vicent Marti
+Comment: Sundown markdown library
+License: Sundown
+
+Files: src/Rbase64.c
+Comment: http://base64.sourceforge.net/b64.c fetched on 2012-05-11
+Copyright: 2001 Bob Trower, Trantor Standard Systems Inc.
+License: b64.c
 
 License: GPL-2
  On Debian systems, the full text of the GNU General Public License
  version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-License: GPL-3
- On Debian systems, the full text of the GNU General Public License
- version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+License: Sundown
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
 
+License: b64.c
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated
+ documentation files (the "Software"), to deal in the
+ Software without restriction, including without limitation
+ the rights 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 FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-markdown.git