[game-data-packager] 01/01: move copyright notices into yaml
Alexandre Detiste
detiste-guest at moszumanska.debian.org
Mon Nov 2 00:16:57 UTC 2015
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 d9b9db3929a95328d2f36c4c96e71c8afe2b61a8
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Mon Nov 2 01:16:21 2015 +0100
move copyright notices into yaml
---
data/hhgg-data.copyright | 40 ----------------------------------------
data/hhgg.yaml | 12 ++++++++++++
data/tyrian-data.copyright | 36 ------------------------------------
data/tyrian.yaml | 15 +++++++++++++++
game_data_packager/__init__.py | 5 ++++-
game_data_packager/build.py | 6 ++++++
6 files changed, 37 insertions(+), 77 deletions(-)
diff --git a/data/hhgg-data.copyright b/data/hhgg-data.copyright
deleted file mode 100644
index 3aae2ba..0000000
--- a/data/hhgg-data.copyright
+++ /dev/null
@@ -1,40 +0,0 @@
-The hhgg-data package was generated using game-data-packager
-It contains proprietary game data and must not be redistributed.
-
-
-"/usr/share/games/hhgg/hhgg.z3" is subject
-to the copyright © 1984 Infocom and
-is also freely playable online here
-http://www.douglasadams.com/creations/infocom.php
-
-
-"/usr/share/pixmaps/hhgg.png", if present,
-is subject to copyright © 2009 iconShock
-
-If was downloaded from this mirror:
-http://www.iconarchive.com/show/hitchhikers-guide-icons-by-iconshock/Arthur-Dent-icon.html
-
-# License: Free for non-commercial use.
-# Commercial usage: Not allowed
-
-Official website: http://www.iconshock.com/
-
-------------------------------------------------------------------------
-
-The Debian packaging is:
-
-© 2008-2013 Jonathan Dowland <jmtd at debian.org>
-© 2014-2015 Simon McVittie <smcv at debian.org>
-© 2015 Alexandre Detiste <alexandre at detiste.be>
-
-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; version 2 of the License.
-
-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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/data/hhgg.yaml b/data/hhgg.yaml
index 95a79a7..2a4d61a 100644
--- a/data/hhgg.yaml
+++ b/data/hhgg.yaml
@@ -4,6 +4,18 @@ plugin: z_code
copyright: © 1984 Infocom
try_repack_from: [/usr/share/pixmaps]
+copyright_notice: |
+ "/usr/share/pixmaps/hhgg.png", if present,
+ is subject to copyright © 2009 iconShock
+
+ If was downloaded from this mirror:
+ http://www.iconarchive.com/show/hitchhikers-guide-icons-by-iconshock/Arthur-Dent-icon.html
+
+ # License: Free for non-commercial use.
+ # Commercial usage: Not allowed
+
+ Official website: http://www.iconshock.com/
+
packages:
hhgg-data:
aliases: [h2g2]
diff --git a/data/tyrian-data.copyright b/data/tyrian-data.copyright
deleted file mode 100644
index d6aab2e..0000000
--- a/data/tyrian-data.copyright
+++ /dev/null
@@ -1,36 +0,0 @@
-The tyrian-data package was generated using game-data-packager.
-
-The files within "/usr/share/games/tyrian-data" are subject
-to the copyright © 1995 Eclipse Productions, Epic MegaGames
-and were in 2004 released as Freeware.
-
-From http://www.freewebs.com/worldtreegames/ :
-> Feel free to play it all you want and share it with friends, but for
-> the moment I'd like to just have a central backup place (here) for
-> the game. In the future I might not mind other sites sharing it,
-> but I do enjoy amusing fans. :)
-
-From http://www.camanis.net/
-> Tyrian has been released as freeware by Jason Emery.
-
-These terms overide the one from the license.doc
-present in tyrian21.zip.
-
-
-The Debian packaging is:
-
-© 2008-2013 Jonathan Dowland <jmtd at debian.org>
-© 2014-2015 Simon McVittie <smcv at debian.org>
-© 2015 Alexandre Detiste <alexandre at detiste.be>
-
-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; version 2 of the License.
-
-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.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL-2.
diff --git a/data/tyrian.yaml b/data/tyrian.yaml
index f295280..92879b9 100644
--- a/data/tyrian.yaml
+++ b/data/tyrian.yaml
@@ -8,6 +8,21 @@ help_text: |
game-data-packager will automatically download it if required.
You can skip the download by providing tyrian21.zip or its contents.
+copyright_notice: |
+ Tyrian was released as Freeware in 2004.
+
+ From http://www.freewebs.com/worldtreegames/ :
+ > Feel free to play it all you want and share it with friends, but for
+ > the moment I'd like to just have a central backup place (here) for
+ > the game. In the future I might not mind other sites sharing it,
+ > but I do enjoy amusing fans. :)
+
+ From http://www.camanis.net/ :
+ > Tyrian has been released as freeware by Jason Emery.
+
+ These terms overide the one from the license.doc
+ present in tyrian21.zip.
+
packages:
tyrian-data:
# there are two identical files in the zip
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index ceaadd1..247e69c 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -316,6 +316,9 @@ class GameData(object):
# The one-line copyright notice used to build debian/copyright
self.copyright = None
+ # A blurb of text that is used to build debian/copyright
+ self.copyright_notice = None
+
# Tag fanmade games so they don't screw up year * size regression
self.fanmade = False
@@ -374,7 +377,7 @@ class GameData(object):
for k in ('longname', 'copyright', 'compress_deb', 'help_text', 'disks', 'fanmade',
'engine', 'genre', 'missing_langs', 'franchise', 'wiki', 'wikibase',
'steam', 'gog', 'dotemu', 'origin', 'url_misc', 'wikipedia',
- 'binary_executables'):
+ 'binary_executables', 'copyright_notice'):
if k in self.data:
setattr(self, k, self.data[k])
diff --git a/game_data_packager/build.py b/game_data_packager/build.py
index 8af4e47..faac9a1 100644
--- a/game_data_packager/build.py
+++ b/game_data_packager/build.py
@@ -1356,6 +1356,12 @@ class PackagingTask(object):
'redistributed under conditions specified in\n')
o.write(',\n'.join(licenses) + '.\n\n')
+
+ if self.game.copyright_notice:
+ o.write('-' * 70)
+ o.write('\n\n' + self.game.copyright_notice + '\n')
+ o.write('-' * 70 + '\n\n')
+
count_usr = 0
exts = set()
count_doc = 0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git
More information about the Pkg-games-commits
mailing list