[adonthell] 60/65: Switch to copyright format 1.0.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository adonthell.

commit ede9ba026b56ef68ac85e5543703c0f8dc0314e1
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jul 12 13:55:37 2016 +0200

    Switch to copyright format 1.0.
---
 debian/copyright | 99 ++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 28 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 10b6e08..67f0abc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,78 @@
-This package was debianized by Gordon Fraser <gordon at debian.org> on
-Wed, 28 Aug 2002 20:37:34 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Adonthell
 
-It was downloaded from http://adonthell.linuxgames.com/download/
+Files: *
+Copyright:
+ 1997-2001 by Dimitri van Heesch
+ 1999 The Adonthell Team
+ 1999-2001 The Adonthell Project
+ 1999-2016 Kai Sterker <kaisterker at linuxgames.com>
+ 1999-2004 Alexandre Courbot <alexandrecourbot at linuxgames.com>
+ 2000-2001, 2004 Joel Vennin
+ 2000-2001 Michael Smith <msmith at labyrinth.net.au>
+ 2000 Andrew Henderson <hendersa at db.erau.edu>
+ 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc.
+License: GPL-2+
 
-Upstream Authors: Kai Sterker & the Adonthell team <adonthell at linuxgames.com>
+Files:
+ src/gettext.h
+ config.guess
+ config.sub
+Copyright: 1995-1998, 2000-2002, 2004-2006, 2009-2011, 2015 Free Software Foundation, Inc
+License: GPL-3+
 
 Copyright:
-	(C) 1997-2001 by Dimitri van Heesch
-	(C) 1999 The Adonthell Team
-	(C) 1999-2001 The Adonthell Project
-	(C) 1999-2004 Kai Sterker <kaisterker at linuxgames.com>
-	(C) 1999-2004 Alexandre Courbot <alexandrecourbot at linuxgames.com>
-	(C) Copyright 2000-2001, 2004 Joel Vennin
-src/tools/oggloop/vcedit.h:  (C) 2000-2001 Michael Smith <msmith at labyrinth.net.au>
-src/tools/oggloop/vcedit.c:  (C) 2000-2001 Michael Smith <msmith at labyrinth.net.au>
-src/audio.h:   (C) 2000 Andrew Henderson <hendersa at db.erau.edu>
-src/gettext.h:  (C) 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc.
-src/tools/charedit/dirbrowser.h:  (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
-src/tools/charedit/dirbrowser.cc:  (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
-src/tools/questedit/dirbrowser.h:  (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
-src/tools/questedit/dirbrowser.cc:  (C) 1998-2000  Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
-src/audio.cc:  (C) 2000 Andrew Henderson <hendersa at db.erau.edu>
+Files: install-sh
+Copyright: 1994 X Consortium
+License: Expat
+ # 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
+ # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #
+ # Except as contained in this notice, the name of the X Consortium shall not
+ # be used in advertising or otherwise to promote the sale, use or other deal-
+ # ings in this Software without prior written authorization from the X Consor-
+ # tium.
+ #
+ #
+ # FSF changes to this file are in the public domain.
 
-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
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+License: GPL-2+
+ 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
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License 2 for more details.
+ .
+ The GNU GPL may be viewed on Debian systems in /usr/share/common-licenses/GPL-2.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
 
-The GNU GPL may be viewed on Debian systems in /usr/share/common-licenses/GPL-2
+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
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License 3 for more details.
+ .
+ The GNU GPL may be viewed on Debian systems in /usr/share/common-licenses/GPL-3.

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