[game-data-packager] 01/01: demos: automatically add ' (demo)' to longname
Alexandre Detiste
detiste-guest at moszumanska.debian.org
Mon Mar 30 10:56:44 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 c7ea4dbc04239f5eced6499d1fa871d9d986b8b0
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Mon Mar 30 12:55:34 2015 +0200
demos: automatically add ' (demo)' to longname
---
data/comi.yaml | 2 +-
data/descent1.yaml | 2 --
data/descent2.yaml | 1 -
data/fullthrottle.yaml | 2 +-
data/grimfandango.yaml | 1 -
data/hexen2.yaml | 2 --
data/quake2.yaml | 1 -
data/quake3.yaml | 1 -
data/theme-hospital.yaml | 1 -
data/wolf3d.yaml | 1 -
doc/adding_a_game.mdwn | 4 +++-
game_data_packager/__init__.py | 5 +++++
12 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/data/comi.yaml b/data/comi.yaml
index e49df08..f112467 100644
--- a/data/comi.yaml
+++ b/data/comi.yaml
@@ -12,7 +12,7 @@ help_text: |
packages:
curse-of-monkey-island-demo-data:
- longname: The Curse of Monkey Island (demo)
+ demo_for: curse-of-monkey-island-data
install:
- comi.la0_demo
- comi.la1_demo
diff --git a/data/descent1.yaml b/data/descent1.yaml
index 312eed9..d2d7bd6 100644
--- a/data/descent1.yaml
+++ b/data/descent1.yaml
@@ -6,7 +6,6 @@ genre: Flight simulator
packages:
descent1-demo-data:
- longname: "Descent: First Strike (demo)"
demo_for: descent1-full-data
debian:
conflicts: descent1-full-data
@@ -20,7 +19,6 @@ packages:
install_to: usr/share/games/d1x-rebirth/
descent1-full-data:
- longname: "Descent: First Strike"
debian:
conflicts: descent1-demo-data
gog:
diff --git a/data/descent2.yaml b/data/descent2.yaml
index 82eadf9..283eeba 100644
--- a/data/descent2.yaml
+++ b/data/descent2.yaml
@@ -6,7 +6,6 @@ genre: Flight simulator
packages:
descent2-demo-data:
- longname: Descent II (demo)
demo_for: descent2-full-data
install:
- d2demo.pig
diff --git a/data/fullthrottle.yaml b/data/fullthrottle.yaml
index a0fe540..fa049fe 100644
--- a/data/fullthrottle.yaml
+++ b/data/fullthrottle.yaml
@@ -181,7 +181,7 @@ packages:
- VIDEO/WHIP_PAN.SAN
- VIDEO/WHIP_PAN.TRS
full-throttle-demo-data:
- longname: Full Throttle (demo)
+ demo_for: full-throttle-data
install:
- data/benbike.nut
- data/bencrshe.san
diff --git a/data/grimfandango.yaml b/data/grimfandango.yaml
index 002ff6e..bc70335 100644
--- a/data/grimfandango.yaml
+++ b/data/grimfandango.yaml
@@ -47,7 +47,6 @@ packages:
- install/readme.txt
grimfandango-demo-data:
- longname: "Grim Fandango (demo)"
demo_for: grimfandango-data
install:
- gfdemo01.lab
diff --git a/data/hexen2.yaml b/data/hexen2.yaml
index 6c16ae4..9983ef3 100644
--- a/data/hexen2.yaml
+++ b/data/hexen2.yaml
@@ -21,7 +21,6 @@ help_text: |
packages:
hexen2-demo-data:
- longname: Hexen II (demo)
demo_for: hexen2-data
debian:
conflicts: hexen2-data
@@ -33,7 +32,6 @@ packages:
# Word 6 .doc, can be translated with antiword
hexen2-data:
- longname: Hexen II
steam:
id: 9060
path: "common/Hexen 2"
diff --git a/data/quake2.yaml b/data/quake2.yaml
index bf9cdef..9580382 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -202,7 +202,6 @@ packages:
- quake2_manual/top_nav.html
quake2-demo-data:
- longname: "Quake II (demo)"
demo_for: quake2-full-data
install_to_docdir:
- quake2_manual
diff --git a/data/quake3.yaml b/data/quake3.yaml
index ccf0032..070a54c 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -153,7 +153,6 @@ packages:
distinctive_size: true
quake3-demo-data:
- longname: Quake III Arena (demo)
# deliberately no quake3-server alternative, I'm pretty sure it isn't
# network-compatible with anything
engine: quake3 (>= 10)
diff --git a/data/theme-hospital.yaml b/data/theme-hospital.yaml
index 859b7e8..22ba2d9 100644
--- a/data/theme-hospital.yaml
+++ b/data/theme-hospital.yaml
@@ -491,7 +491,6 @@ packages:
- data/watch01v.tab
theme-hospital-demo-data:
- longname: Theme Hospital (Demo)
install_to: usr/share/games/theme-hospital
demo_for: theme-hospital-full-data
debian:
diff --git a/data/wolf3d.yaml b/data/wolf3d.yaml
index b286285..41a548d 100644
--- a/data/wolf3d.yaml
+++ b/data/wolf3d.yaml
@@ -9,7 +9,6 @@ packages:
demo_for:
- wolf3d-full-v12-data
- wolf3d-full-v14-data
- longname: Wolfenstein 3D (demo)
debian:
provides: wolf3d-data
replaces: wolf3d-data-wl1
diff --git a/doc/adding_a_game.mdwn b/doc/adding_a_game.mdwn
index 3852c55..5c377bc 100644
--- a/doc/adding_a_game.mdwn
+++ b/doc/adding_a_game.mdwn
@@ -90,7 +90,9 @@ The `packages` top-level item is a mapping from Debian binary package name
to mapping:
* `longname`: string: the "marketing name" of the game or expansion
- in this package, if it differs from the top-level `longname`
+ in this package, if it differs from the top-level `longname`.
+ Unless otherly specified, `' (demo)'` will automatically
+ be appended to packages with a `demo_for` tag.
* `copyright`: string: the copyright string, if it differs from top-level
* `demo_for`: this reference the full game included in same YAML file
`expansion_for`: this reference the matching full game included
diff --git a/game_data_packager/__init__.py b/game_data_packager/__init__.py
index 48d393f..33bf581 100644
--- a/game_data_packager/__init__.py
+++ b/game_data_packager/__init__.py
@@ -769,6 +769,11 @@ class GameData(object):
else:
package.demo_for |= set(d['demo_for'])
assert package.name != d['demo_for'], "a game can't be a demo for itself"
+ if not package.longname:
+ package.longname = self.longname + ' (demo)'
+ else:
+ assert 'demo' not in package.name, package.name + ' miss a demo_for tag.'
+
if 'expansion_for' in d:
assert package.name != d['expansion_for'], \
"a game can't be an expansion for itself"
--
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