[game-data-packager] 03/03: lintian: fix 2 'dep5-copyright-license-name-not-unique'

[Alexandre Detiste]

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

detiste-guest pushed a commit to branch master
in repository game-data-packager.

commit 2df12dad5e40c51af7c86c94f22d0e26f033cd0a
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Tue Jul 14 09:52:32 2015 +0200

    lintian: fix 2 'dep5-copyright-license-name-not-unique'
---
 debian/copyright    | 9 +++++----
 debian/copyright.in | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 9835f49..952c2dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -87,6 +87,7 @@ Copyright:
  © 2006 Fredrick Johansson
  © 2007 Jon Dowland
 License: GPL-2
+Comment:
  Based on the Doom Wikia logo by Fredrik Johansson
  <http://doom.wikia.com/wiki/Image:Wikilogo.png>
  .
@@ -155,13 +156,15 @@ Comment:
  licensed under CC-BY-SA-2.0, but it was later released into
  the public domain as part of the Tango project.
 
+License: wikimedia-Public-Domain
+ I, the copyright holder of this work, release this work into the
+ public domain. This applies worldwide.
+
 Files:
  data/inherit.xpm
  data/inherit.svg
 Copyright: none
 License: wikimedia-Public-Domain
- I, the copyright holder of this work, release this work into the
- public domain. This applies worldwide.
 Comment:
  Taken from https://commons.wikimedia.org/wiki/File:Emblem-earth.svg
  Metadata in the file marks it as made by Jakub Steiner and Tuomas Kuosmanen
@@ -174,8 +177,6 @@ Files:
  data/kyrandia2.svg
 Copyright: none
 License: wikimedia-Public-Domain
- I, the copyright holder of this work, release this work into the
- public domain. This applies worldwide.
 Comment:
  Taken from https://commons.wikimedia.org/wiki/File:Conical_flask_blue.svg
  Metadata in the file marks it as made by André Wyrwa and Frederic Bellaiche
diff --git a/debian/copyright.in b/debian/copyright.in
index f82b7d8..bfa691a 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -85,6 +85,7 @@ Copyright:
  © 2006 Fredrick Johansson
  © 2007 Jon Dowland
 License: GPL-2
+Comment:
  Based on the Doom Wikia logo by Fredrik Johansson
  <http://doom.wikia.com/wiki/Image:Wikilogo.png>
  .
@@ -153,13 +154,15 @@ Comment:
  licensed under CC-BY-SA-2.0, but it was later released into
  the public domain as part of the Tango project.
 
+License: wikimedia-Public-Domain
+ I, the copyright holder of this work, release this work into the
+ public domain. This applies worldwide.
+
 Files:
  data/inherit.xpm
  data/inherit.svg
 Copyright: none
 License: wikimedia-Public-Domain
- I, the copyright holder of this work, release this work into the
- public domain. This applies worldwide.
 Comment:
  Taken from https://commons.wikimedia.org/wiki/File:Emblem-earth.svg
  Metadata in the file marks it as made by Jakub Steiner and Tuomas Kuosmanen
@@ -172,8 +175,6 @@ Files:
  data/kyrandia2.svg
 Copyright: none
 License: wikimedia-Public-Domain
- I, the copyright holder of this work, release this work into the
- public domain. This applies worldwide.
 Comment:
  Taken from https://commons.wikimedia.org/wiki/File:Conical_flask_blue.svg
  Metadata in the file marks it as made by André Wyrwa and Frederic Bellaiche

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