[game-data-packager] 01/02: doom_common: factor our install_to: usr/share/games/doom
Alexandre Detiste
detiste-guest at moszumanska.debian.org
Tue Nov 3 21:02:28 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 04a3e743155a532d3a8adf7ac5ff5e6ab63be87f
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Tue Nov 3 21:47:11 2015 +0100
doom_common: factor our install_to: usr/share/games/doom
---
data/chex.yaml | 2 --
data/compet-n.yaml | 1 -
data/doom.yaml | 1 -
data/doom2.yaml | 6 +-----
data/final-doom.yaml | 2 --
data/hacx.yaml | 1 -
data/heretic.yaml | 2 --
data/hexen.yaml | 4 ----
data/strife.yaml | 1 -
game_data_packager/games/doom_common.py | 9 +++++----
10 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/data/chex.yaml b/data/chex.yaml
index 446eb6b..9b586af 100644
--- a/data/chex.yaml
+++ b/data/chex.yaml
@@ -12,7 +12,6 @@ wiki: Chex_Quest
packages:
chexquest-data:
longname: Chex Quest
- install_to: usr/share/games/doom
main_wads:
chex.wad: {}
install:
@@ -28,7 +27,6 @@ packages:
main_wads:
chex2.wad:
args: -iwad chex.wad -file %s
- install_to: usr/share/games/doom
install:
- chex2.wad
diff --git a/data/compet-n.yaml b/data/compet-n.yaml
index a35f275..d945b3b 100644
--- a/data/compet-n.yaml
+++ b/data/compet-n.yaml
@@ -42,7 +42,6 @@ packages:
requiem.wad:
name: Requiem
args: -file %s req21fix.wad reqmus.wad
- install_to: usr/share/games/doom
install:
- all wads
doc:
diff --git a/data/doom.yaml b/data/doom.yaml
index 3da429a..ec5942a 100644
--- a/data/doom.yaml
+++ b/data/doom.yaml
@@ -32,7 +32,6 @@ packages:
gog:
url: the_ultimate_doom
game: the_ultimate_doom_game
- install_to: usr/share/games/doom
longname: Doom
install:
- doom.wad
diff --git a/data/doom2.yaml b/data/doom2.yaml
index e4d6031..3fa6e38 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -29,7 +29,6 @@ packages:
gog:
url: doom_ii_final_doom
game: doom_ii_master_levels_game
- install_to: usr/share/games/doom
install:
- doom2.wad
optional:
@@ -43,7 +42,6 @@ packages:
steam:
id: 208200
path: "common/DOOM 3 BFG Edition"
- install_to: usr/share/games/doom
main_wads:
nerve.wad:
args: -file %s
@@ -64,10 +62,8 @@ packages:
debian:
depends: doom2-wad | freedoom
recommends: game-data-packager
- install_to: usr/share/games/doom
symlinks:
- usr/share/games/doom/doom2-masterlevels-tryexec:
- etc/alternatives/doom
+ $install_to/doom2-masterlevels-tryexec: etc/alternatives/doom
install:
- attack.wad
- blacktwr.wad
diff --git a/data/final-doom.yaml b/data/final-doom.yaml
index efd61b2..a42e67e 100644
--- a/data/final-doom.yaml
+++ b/data/final-doom.yaml
@@ -36,7 +36,6 @@ packages:
main_wads:
tnt.wad:
args: -iwad %s -file tnt31.wad
- install_to: usr/share/games/doom
plutonia-wad:
longname: "Final Doom: The Plutonia Experiment"
@@ -48,7 +47,6 @@ packages:
- plutonia.wad
optional:
- manual.pdf
- install_to: usr/share/games/doom
files:
tnt.wad:
diff --git a/data/hacx.yaml b/data/hacx.yaml
index 243504a..b4eba0e 100644
--- a/data/hacx.yaml
+++ b/data/hacx.yaml
@@ -18,7 +18,6 @@ help_text: |
packages:
hacx-data:
component: non-free
- install_to: usr/share/games/doom
install:
- hacx.wad
license:
diff --git a/data/heretic.yaml b/data/heretic.yaml
index 0fcd21e..4e2cbb7 100644
--- a/data/heretic.yaml
+++ b/data/heretic.yaml
@@ -27,13 +27,11 @@ packages:
steam:
id: 2390
path: "common/Heretic Shadow of the Serpent Riders"
- install_to: usr/share/games/doom
install:
- heretic.wad
heretic-shareware-wad:
longname: "Heretic (shareware)"
- install_to: usr/share/games/doom
demo_for: heretic-wad
component: non-free
debian:
diff --git a/data/hexen.yaml b/data/hexen.yaml
index 71e270a..f12ff5b 100644
--- a/data/hexen.yaml
+++ b/data/hexen.yaml
@@ -29,7 +29,6 @@ packages:
steam:
id: 2360
path: "common/Hexen"
- install_to: usr/share/games/doom
install:
- hexen.wad
@@ -42,7 +41,6 @@ packages:
steam:
id: 2370
path: "common/Hexen Deathkings of the Dark Citadel"
- install_to: usr/share/games/doom
expansion_for: hexen-wad
install:
- hexdd.wad
@@ -52,13 +50,11 @@ packages:
debian:
replaces: hexen-demo-data
breaks: chocolate-doom (<< 2.2.0)
- install_to: usr/share/games/doom
demo_for: hexen-wad
install:
- hexendemo.wad
files:
-
hexen.wad:
alternatives:
- hexen.wad_1.1
diff --git a/data/strife.yaml b/data/strife.yaml
index 200f688..a5110b6 100644
--- a/data/strife.yaml
+++ b/data/strife.yaml
@@ -26,7 +26,6 @@ packages:
steam:
id: 317040
path: common/Strife
- install_to: usr/share/games/doom
install:
- strife1.wad
- voices.wad
diff --git a/game_data_packager/games/doom_common.py b/game_data_packager/games/doom_common.py
index 6cdb61f..93e6fd2 100644
--- a/game_data_packager/games/doom_common.py
+++ b/game_data_packager/games/doom_common.py
@@ -25,7 +25,7 @@ from .. import GameData
from ..build import (PackagingTask)
from ..paths import DATADIR
from ..util import (copy_with_substitutions, mkdir_p, lintian_desktop)
-from ..version import FORMAT
+from ..version import (FORMAT, ASSETS)
logger = logging.getLogger('game-data-packager.games.doom-common')
@@ -77,6 +77,7 @@ class DoomGameData(GameData):
}
for package in self.packages.values():
+ package.install_to = ASSETS + '/doom'
engine = package.engine or self.engine
engine = engine.split('|')[-1].strip()
package.program = package_map.get(engine, engine)
@@ -151,10 +152,10 @@ class DoomTask(PackagingTask):
elif package.expansion_for:
iwad = self.game.packages[package.expansion_for].only_file
assert iwad is not None, "Couldn't find %s's IWAD" % main_wad
- args = ( '-iwad /usr/share/games/doom/' + iwad
- + ' -file /usr/share/games/doom/' + main_wad)
+ args = ( '-iwad /' + package.install_to + iwad
+ + ' -file /' + package.install_to + main_wad)
else:
- args = '-iwad /usr/share/games/doom/' + main_wad
+ args = '-iwad /' + package.install_to + main_wad
entry['Exec'] = package.program + ' ' + args
entry['Icon'] = desktop_file
entry['Terminal'] = 'false'
--
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