[grits] 03/04: Update copyright file using copyright-format 1.0.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository grits.

commit 67f42e474590646bbed2688d0537518e87559098
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 6 17:18:13 2016 +0200

    Update copyright file using copyright-format 1.0.
---
 debian/changelog |  1 +
 debian/copyright | 32 ++++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6954ef5..1c92525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libgrits (0.8.1-2) UNRELEASED; urgency=medium
   * Add gbp.conf to use pristine-tar by default.
   * Restructure control file with cme, changes:
     - Update Vcs-* URLs to use HTTPS.
+  * Update copyright file using copyright-format 1.0.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 May 2016 17:08:40 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 6bcff88..4a265ce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,33 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: Grits
-Maintainer: Andy Spencer <andy753421 at gmail.com>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Grits
+Upstream-Contact: Andy Spencer <andy753421 at gmail.com>
 Source: http://pileus.org/grits/
 
 Files: *
-Copyright: 2009-2013, Andy Spencer <andy753421 at gmail.com>
+Copyright: 2009-2013 Andy Spencer <andy753421 at gmail.com>
+License: GPL-3+
+
+Files: src/objects/marching.h
+Copyright: 2002, Jamie Zawinski <jwz at jwz.org>
+      2009-2011, Andy Spencer <andy753421 at gmail.com>
+Comment:  Marching cubes implementation based on code from the
+ xscreensaver package.
+License: GPL-3+
+
+Files: src/objects/marching.c
+Copyright: 2002, Jamie Zawinski <jwz at jwz.org>
+      2009-2011, Andy Spencer <andy753421 at gmail.com>
+Comment: Marching cubes implementation by Paul Bourke <pbourke at swin.edu.au>
+ http://astronomy.swin.edu.au/~pbourke/modelling/polygonise/
+License: marching
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.  No representations are made about the suitability of this
+ software for any purpose.  It is provided "as is" without express or
+ implied warranty.
+
 License: GPL-3+
  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
@@ -22,3 +45,4 @@ License: GPL-3+
  On Debian systems, the full text of the GNU General Public
  License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grits.git