[game-data-packager] 06/10: Merge branch 'master', remove duplicated 'engine:'s
Simon McVittie
smcv at debian.org
Sun Jan 18 09:25:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository game-data-packager.
commit 106056eb10e1d82876f2bbb5d066450c217bac45
Merge: e6f2474 9e6c3d5
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date: Sun Jan 18 09:13:41 2015 +0100
Merge branch 'master', remove duplicated 'engine:'s
Conflicts:
data/rott-data.control.in
data/rott-extreme-data.control.in
data/rott-registered-data.control.in
debian/changelog
Makefile | 2 -
data/doom-common.control.in | 9 --
data/doom.yaml | 2 +
data/doom2.yaml | 2 +
data/final-doom.yaml | 4 +
data/heretic.control.in | 9 --
data/heretic.yaml | 4 +-
data/hexen-deathkings-data.control.in | 10 --
data/hexen-demo-data.control.in | 5 +
data/hexen.control.in | 9 --
data/hexen.yaml | 39 ++++----
data/hexen2-data.control.in | 10 --
data/hexen2-hexenworld-data.control.in | 10 --
data/hexen2-portals-data.control.in | 10 --
data/hexen2.yaml | 2 +-
data/ja.yaml | 4 +-
data/jedi-academy-bonus-data.control.in | 9 --
data/jedi-academy-data.control.in | 9 --
data/jedi-outcast-data.control.in | 9 --
data/jk2.yaml | 2 +-
.../lgeneral-data-nonfree.control.in | 8 --
.../lgeneral-data-nonfree.copyright | 2 +-
data/lgeneral.yaml | 35 +++++++
data/quake.yaml | 2 +-
data/quake2.yaml | 3 +-
data/quake3-data.control.in | 10 --
data/quake3-team-arena-data.control.in | 8 --
data/rott-data.control.in | 2 +
data/rott-extreme-data.control.in | 2 +
data/rott-registered-data.control.in | 2 +
data/spear-of-destiny-demo-data.control.in | 9 --
data/spear-of-destiny-mission3-data.control.in | 10 --
data/tyrian-data.control.in | 10 --
data/wolf3d-demo-data.control.in | 9 --
data/wolf3d-full-data.control.in | 9 --
data/wolf3d.yaml | 2 +
debian/changelog | 12 +++
etc/lgeneral-mirrors | 1 +
lgeneral.mk | 45 ---------
lib/game_data_packager/__init__.py | 110 +++++++++++++++++----
lib/game_data_packager/games/doom_common.py | 12 ++-
lib/game_data_packager/games/lgeneral.py | 72 ++++++++++++++
lib/game_data_packager/games/rott.py | 4 +-
lib/game_data_packager/games/tyrian.py | 4 +-
lib/game_data_packager/games/wolf3d.py | 4 +-
lib/lgeneral-mirrors | 1 -
supported/lgeneral | 103 +------------------
47 files changed, 273 insertions(+), 378 deletions(-)
diff --cc data/heretic.yaml
index 6324c7b,b12be68..3a8d2f0
--- a/data/heretic.yaml
+++ b/data/heretic.yaml
@@@ -21,16 -21,14 +21,16 @@@ help_text:
packages:
heretic-wad:
+ debian:
- engine: chocolate-doom | heretic-engine
++ engine: "chocolate-doom | heretic-engine"
install_to: usr/share/games/doom
install:
- heretic.wad
heretic-shareware-data:
longname: "Heretic (shareware)"
+ debian:
- engine: chocolate-doom | heretic-engine
++ engine: "chocolate-doom | heretic-engine"
install_to: usr/share/games/doom
demo_for: heretic-wad
install:
diff --cc data/hexen.yaml
index f868981,0b15542..2242320
--- a/data/hexen.yaml
+++ b/data/hexen.yaml
@@@ -25,8 -25,6 +25,8 @@@ doom_engine: hexe
packages:
hexen-wad:
+ debian:
- engine: chocolate-doom | hexen-engine
++ engine: "chocolate-doom | hexen-engine"
install_to: usr/share/games/doom
install:
- hexen.wad
@@@ -37,14 -37,18 +37,14 @@@
expansion_for: hexen-wad
install:
- hexdd.wad
- debian:
- engine: "chocolate-doom | hexen-engine"
- # Disabled, doesn't seem to work
- #hexen-demo-data:
- # longname: "Hexen: Beyond Heretic (demo)"
- # install_to: usr/share/games/doom
- # demo_for: hexen-wad
- # install:
- # - hexendemo.wad
+ hexen-demo-data:
+ longname: "Hexen: Beyond Heretic (demo)"
+ install_to: usr/share/games/doom
+ demo_for: hexen-wad
+ install:
+ - hexendemo.wad
+ doom_engine: doomsday-compat
- debian:
- engine: doomsday
files:
diff --cc data/hexen2.yaml
index 5521f6c,f87a027..56e4e0a
--- a/data/hexen2.yaml
+++ b/data/hexen2.yaml
@@@ -17,8 -17,6 +17,8 @@@ help_text:
packages:
hexen2-data:
longname: Hexen II
+ debian:
- engine: hexen2-engine
++ engine: "uhexen2 | hexen2-engine"
steam:
id: 9060
path: "common/Hexen 2"
diff --cc data/ja.yaml
index 130db27,2f2665b..6819f6e
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@@ -31,9 -31,6 +31,9 @@@ help_text:
packages:
jedi-academy-data:
+ debian:
- version: 1.01
- engine: openjk-academy
++ version: '1.01'
++ engine: openjk-academy | openjk-academy-server
install_files_from_cksums: |
# Jedi Academy CD1 GameData/GameData or installation
3585517488 561806019 base/assets0.pk3
diff --cc data/jk2.yaml
index 3174c29,2965cf7..29c09c2
--- a/data/jk2.yaml
+++ b/data/jk2.yaml
@@@ -24,9 -24,6 +24,9 @@@ help_text:
packages:
jedi-outcast-data:
+ debian:
- version: 1.04
++ version: '1.04'
+ engine: openjk-outcast
# cksums(1) is pretty useless as a checksumming tool, but it's a convenient
# way to get exact file sizes in bytes (second column), which are a nice
# heuristic for identifying files
diff --cc data/quake.yaml
index 711322d,e65bc1a..c4e158d
--- a/data/quake.yaml
+++ b/data/quake.yaml
@@@ -28,9 -24,11 +28,9 @@@ packages
- manual.txt_101_cd
- rlicnse.txt_101_cd
install_to: usr/share/games/quake
- debian:
- engine: quake | quake-server
quake-armagon:
- expansion_for: quake-armagon
+ expansion_for: quake-registered
longname: "Quake Mission Pack 1: Scourge of Armagon"
install:
- hipnotic/pak0.pak
diff --cc data/quake2.yaml
index cd24301,620801d..dd67674
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@@ -3,10 -3,6 +3,9 @@@
packages:
quake2-full-data:
longname: Quake II
+ debian:
+ engine: quake2 | quake2-server
- provides: quake2-data
+ replaces: quake2-data
steam:
id: 2320
path: "common/Quake 2"
@@@ -30,8 -26,8 +29,8 @@@
quake2-demo-data:
demo_for: quake2-full-data
+ debian:
- engine: quake2
++ engine: quake2 | quake2-server
install_to: usr/share/games/quake2-demo
install_to_docdir:
- quake2_manual
diff --cc debian/changelog
index f77987e,8b80e4a..7997c87
--- a/debian/changelog
+++ b/debian/changelog
@@@ -44,7 -52,8 +52,9 @@@ game-data-packager (39) UNRELEASED; urg
[ Alexandre Detiste ]
* convert tyrian-data to YAML style
* Convert Wolfenstein 3D to YAML style
+ * Add 'make manual-check' which tests some common code paths using
+ a local mirror of some freely downloadable games
+ * generate control files automaticaly
[ Simon McVittie ]
* For games in YAML style, do the .deb building and installation in
--
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