[game-data-packager] 02/10: add debian/version & debian/engine in all .yaml

Simon McVittie smcv at debian.org
Sun Jan 18 09:25:15 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 62ae0f9616a71bbadee5e517d92bdbcfdad96f2f
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sat Jan 17 22:33:08 2015 +0100

    add debian/version & debian/engine in all .yaml
---
 data/doom.yaml                     | 2 ++
 data/doom2.yaml                    | 2 ++
 data/final-doom.yaml               | 4 ++++
 data/heretic.yaml                  | 4 ++++
 data/hexen.yaml                    | 2 ++
 data/hexen2.yaml                   | 2 ++
 data/ja.yaml                       | 3 +++
 data/jk2.yaml                      | 3 +++
 data/quake.yaml                    | 4 ++++
 data/quake2.yaml                   | 2 ++
 data/quake3.yaml                   | 2 ++
 data/rott.yaml                     | 4 ++++
 data/tyrian.yaml                   | 2 ++
 data/wolf3d.yaml                   | 4 ++++
 debian/changelog                   | 1 +
 lib/game_data_packager/__init__.py | 2 ++
 16 files changed, 43 insertions(+)

diff --git a/data/doom.yaml b/data/doom.yaml
index 2139afa..2c58645 100644
--- a/data/doom.yaml
+++ b/data/doom.yaml
@@ -22,6 +22,8 @@ help_text: |
 
 packages:
   doom-wad:
+    debian:
+      engine: chocolate-doom | doom-engine
     install_to: usr/share/games/doom
     longname: Doom
     install:
diff --git a/data/doom2.yaml b/data/doom2.yaml
index c63bafb..2351bb9 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -16,6 +16,8 @@ help_text: |
 
 packages:
   doom2-wad:
+    debian:
+      engine: chocolate-doom | doom-engine
     install_to: usr/share/games/doom
     install:
     - doom2.wad
diff --git a/data/final-doom.yaml b/data/final-doom.yaml
index ef8c634..7696947 100644
--- a/data/final-doom.yaml
+++ b/data/final-doom.yaml
@@ -16,12 +16,16 @@ packages:
     # these are IWADs so technically they behave like full games:
     # you don't need Doom or Doom II to play them
     longname: "Final Doom: TNT: Evilution"
+    debian:
+      engine: chocolate-doom | doom-engine
     install:
     - tnt.wad
     install_to: usr/share/games/doom
 
   plutonia-wad:
     longname: "Final Doom: The Plutonia Experiment"
+    debian:
+      engine: chocolate-doom | doom-engine
     install:
     - plutonia.wad
     install_to: usr/share/games/doom
diff --git a/data/heretic.yaml b/data/heretic.yaml
index 1f9e004..6324c7b 100644
--- a/data/heretic.yaml
+++ b/data/heretic.yaml
@@ -21,12 +21,16 @@ help_text: |
 
 packages:
   heretic-wad:
+    debian:
+      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
     install_to: usr/share/games/doom
     demo_for: heretic-wad
     install:
diff --git a/data/hexen.yaml b/data/hexen.yaml
index a0720b4..f868981 100644
--- a/data/hexen.yaml
+++ b/data/hexen.yaml
@@ -25,6 +25,8 @@ doom_engine: hexen
 
 packages:
   hexen-wad:
+    debian:
+      engine: chocolate-doom | hexen-engine
     install_to: usr/share/games/doom
     install:
     - hexen.wad
diff --git a/data/hexen2.yaml b/data/hexen2.yaml
index 425d79b..5521f6c 100644
--- a/data/hexen2.yaml
+++ b/data/hexen2.yaml
@@ -17,6 +17,8 @@ help_text: |
 packages:
   hexen2-data:
     longname: Hexen II
+    debian:
+      engine: hexen2-engine
     steam:
       id: 9060
       path: "common/Hexen 2"
diff --git a/data/ja.yaml b/data/ja.yaml
index 6168704..130db27 100644
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@ -31,6 +31,9 @@ help_text: |
 
 packages:
   jedi-academy-data:
+    debian:
+      version: 1.01
+      engine: openjk-academy
     install_files_from_cksums: |
       # Jedi Academy CD1 GameData/GameData or installation
       3585517488 561806019 base/assets0.pk3
diff --git a/data/jk2.yaml b/data/jk2.yaml
index db92dc8..3174c29 100644
--- a/data/jk2.yaml
+++ b/data/jk2.yaml
@@ -24,6 +24,9 @@ help_text: |
 
 packages:
   jedi-outcast-data:
+    debian:
+      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 --git a/data/quake.yaml b/data/quake.yaml
index ff9e2cb..c0b8cf7 100644
--- a/data/quake.yaml
+++ b/data/quake.yaml
@@ -6,6 +6,8 @@ packages:
   quake-shareware:
     demo_for: quake-registered
     longname: Quake (shareware)
+    debian:
+      engine: quake-engine
     install:
     - id1/pak0.pak_106
     - licinfo.txt_shareware
@@ -13,6 +15,8 @@ packages:
     install_to: usr/share/games/quake
 
   quake-registered:
+    debian:
+      engine: quake-engine
     install:
     - id1/pak0.pak_106
     - id1/pak1.pak
diff --git a/data/quake2.yaml b/data/quake2.yaml
index c51a737..94039d5 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -3,6 +3,8 @@
 packages:
   quake2-full-data:
     longname: Quake II
+    debian:
+      engine: quake2 | quake2-server
     steam:
       id: 2320
       path: "common/Quake 2"
diff --git a/data/quake3.yaml b/data/quake3.yaml
index 90e75ff..adc5793 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -30,6 +30,8 @@ help_text: |
 packages:
   quake3-data:
     longname: Quake III Arena
+    debian:
+      engine: quake3 | quake3-server
     steam:
       id: 2200
     # We deliberately only put baseq3 in the search path, not
diff --git a/data/rott.yaml b/data/rott.yaml
index 5d149a6..018e3ee 100644
--- a/data/rott.yaml
+++ b/data/rott.yaml
@@ -11,6 +11,8 @@ packages:
   rott-data:
     install_to: usr/share/games/rott
     longname: "Rise of the Triad: The HUNT begins"
+    debian:
+      engine: rott
     # this shareware data are considered a as full game because
     # it includes the HUNT Begin levels not present in the commercial game
 
@@ -27,6 +29,8 @@ packages:
 
   rott-registered-data:
     longname: "Rise of the Triad: Dark War"
+    debian:
+      engine: rott
     install_to: usr/share/games/rott
     install:
     - any_registered_rtc
diff --git a/data/tyrian.yaml b/data/tyrian.yaml
index 5c8fca0..0cb6704 100644
--- a/data/tyrian.yaml
+++ b/data/tyrian.yaml
@@ -10,6 +10,8 @@ help_text: |
 
 packages:
   tyrian-data:
+    debian:
+      engine: opentyrian
     # there are two identical files in the zip
     symlinks:
       usr/share/games/tyrian/netset.pcx: usr/share/games/tyrian/tyrset.pcx
diff --git a/data/wolf3d.yaml b/data/wolf3d.yaml
index 5aa07aa..2f1e377 100644
--- a/data/wolf3d.yaml
+++ b/data/wolf3d.yaml
@@ -6,6 +6,8 @@ packages:
   wolf3d-demo-data:
     demo_for: wolf3d-full-data
     longname: Wolfenstein 3D (demo)
+    debian:
+      engine: wolf4sdl
     install_to: usr/share/games/wolf3d
     install_files_from_cksums: |
       2707522358 1156   audiohed.wl1
@@ -21,6 +23,8 @@ packages:
 
   wolf3d-full-data:
     longname: Wolfenstein 3D
+    debian:
+      engine: wolf4sdl
     steam:
       id: 2270
       path: common/Wolfenstein 3D
diff --git a/debian/changelog b/debian/changelog
index 6bb46a5..f77987e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ game-data-packager (39) UNRELEASED; urgency=medium
   [ Alexandre Detiste ]
   * convert tyrian-data to YAML style
   * Convert Wolfenstein 3D to YAML style
+  * generate control files automaticaly
 
   [ Simon McVittie ]
   * For games in YAML style, do the .deb building and installation in
diff --git a/lib/game_data_packager/__init__.py b/lib/game_data_packager/__init__.py
index bb4dce8..0a2210c 100644
--- a/lib/game_data_packager/__init__.py
+++ b/lib/game_data_packager/__init__.py
@@ -1512,6 +1512,8 @@ class GameData(object):
         if package.expansion_for:
             depends.add(package.expansion_for)
         engine = package.debian.get('engine')
+        assert engine is None or package.type != 'expansion', \
+               'An expansion will inherit the engine of the full game'
         if engine:
             recommends.add(engine)
         for other_package in self.packages.values():

-- 
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