[freecol] 82/125: Update debian/copyright. Fix Lintian warnings

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository freecol.

commit f8fa4dcbe5de4b3fd92bd6f23084283a8f564d6c
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 19 23:03:29 2015 +0100

    Update debian/copyright. Fix Lintian warnings
---
 debian/copyright | 58 ++++++++++++++++++++++++++------------------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 690ac7e..9c2e508 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,42 +1,18 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Source: http://www.freecol.org
-Upstream-Name: freecol
+Upstream-Name: Freecol
 Upstream-Contact: The FreeCol Team <freecol-developers at lists.sourceforge.net>
 Comment:
  This package was debianized by Vincent Fourmond <fourmond at debian.org> on
  Mon, 01 Oct 2007 23:58:51 +0200.
- .
- The original tarball was made downloading the freecol-*-src.tar.gz
- tarball on http://www.freecol.org/download.html, applying the patch
- debian/freecol-dist-targz.diff and then using the ant target
- tarDistBundle.
- .
- For more details, see the debian/new-upstream script that does precisely
- this.
 
 Files: *
 Copyright: Copyright (C) 2003-2009 The FreeCol Team
 License: GPL-2+
- This package 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 of the License, or
- (at your option) any later version.
- .
- This package 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.
- .
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the complete text of the GNU General Public
- License version 2 can be found in  `/usr/share/common-licenses/GPL-2'.
-
 
 Files: debian/*
-Copyright: Copyright (C) 2007-2009 Vincent Fourmond <fourmond at debian.org>
+Copyright: 2007-2015, Vincent Fourmond <fourmond at debian.org>
+           2013-2015, Markus Koschany <apo at debian.org>
 License: GPL-2+
 
 Files: data/fonts/ShadowedBlack.ttf is
@@ -54,8 +30,8 @@ Files: data/images/ui/bg_map1.jpg
        data/images/ui/trade.png
        data/images/ui/exploration.png
        data/images/ui/landing.png
-Copyright: not copyrightable
-License: PD
+Copyright: public-domain
+License: public-domain
  The aforementioned images are fidel copies of objects in the public
  domain and are thus not copyrightable (see for instance
  http://en.wikipedia.org/wiki/Bridgeman_Art_Library_v._Corel_Corp for
@@ -64,7 +40,27 @@ License: PD
 Files: data/images/monarch/*
        data/images/ui/bg_europe.jpg
        data/images/ui/doi.png
-Copyright: no copyright
-License: PD
+Copyright: no-copyright
+License: public-domain-wikipedia
  The aforementioned files were downloaded from Wikimedia and are in
  the public domain.
+
+License: GPL-2+
+ This package 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 of the License, or
+ (at your option) any later version.
+ .
+ This package 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in  `/usr/share/common-licenses/GPL-2'.
+
+

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