[game-data-packager] 20/24: Jedi games, Hexen II: reduce boilerplate

[Simon McVittie]

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 7cc8460915b6ab44416c4d15d3cdba971e3a646a
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jan 17 23:18:59 2015 +0000

    Jedi games, Hexen II: reduce boilerplate
---
 data/hexen2.yaml                        | 12 ++++++------
 data/ja.yaml                            |  5 +++++
 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                           |  3 +++
 6 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/data/hexen2.yaml b/data/hexen2.yaml
index 4a6aa64..f87a027 100644
--- a/data/hexen2.yaml
+++ b/data/hexen2.yaml
@@ -24,8 +24,8 @@ packages:
     install_files_from_cksums: |
       2912412704 22704056 data1/pak0.pak
       4210700438 75601170 data1/pak1.pak
-      debian:
-        engine: "uhexen2 | hexen2-engine"
+    debian:
+      engine: "uhexen2 | hexen2-engine"
 
   hexen2-portals-data:
     longname: "Hexen II Mission Pack: Portal of Praevus"
@@ -33,8 +33,8 @@ packages:
     install_to: usr/share/games/hexen2
     install_files_from_cksums: |
       1873146513 49089114 portals/pak3.pak
-      debian:
-        engine: "uhexen2 | hexen2-engine"
+    debian:
+      engine: "uhexen2 | hexen2-engine"
 
   hexen2-hexenworld-data:
     longname: "Hexen II: HexenWorld"
@@ -42,8 +42,8 @@ packages:
     install_to: usr/share/games/hexen2
     install_files_from_cksums: |
       _ 10780245 hw/pak4.pak
-      debian:
-        engine: "uhexen2 | hexen2-engine"
+    debian:
+      engine: "uhexen2 | hexen2-engine"
 
 files:
   hexenworld-pakfiles-0.15.tgz:
diff --git a/data/ja.yaml b/data/ja.yaml
index 6168704..2f2665b 100644
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@ -40,6 +40,9 @@ packages:
       # Jedi Academy patch 1.04 (self-extracting patch, no known way to extract
       # programatically)
       3247293709 9282026 base/assets3.pk3
+    debian:
+      engine: openjk-academy | openjk-academy-server
+      version: '1.01'
 
   jedi-academy-bonus-data:
     longname: "Bonus maps for Jedi Academy"
@@ -47,6 +50,8 @@ packages:
     install_files_from_cksums: |
       2890259980 14328834 base/bonus.pk3
       4222768269 5948070 base/siege_destroyer.pk3
+    debian:
+      engine: openjk-academy | openjk-academy-server
 
 files:
   jabonusmaps.exe:
diff --git a/data/jedi-academy-bonus-data.control.in b/data/jedi-academy-bonus-data.control.in
index 7566878..12b01f6 100644
--- a/data/jedi-academy-bonus-data.control.in
+++ b/data/jedi-academy-bonus-data.control.in
@@ -1,12 +1,3 @@
-Package: jedi-academy-bonus-data
-Version: VERSION
-Section: non-free/games
-Priority: optional
-Architecture: all
-Multi-Arch: foreign
-Recommends: jedi-academy-data, openjk-academy
-Installed-Size: 500000
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Description: Star Wars Jedi Knight: Jedi Academy bonus data files
  Jedi Academy requires an engine and game data to play. This
  package was generated using the "game-data-packager"
diff --git a/data/jedi-academy-data.control.in b/data/jedi-academy-data.control.in
index 217cfa0..f8941a9 100644
--- a/data/jedi-academy-data.control.in
+++ b/data/jedi-academy-data.control.in
@@ -1,12 +1,3 @@
-Package: jedi-academy-data
-Version: 1.01+VERSION
-Section: non-free/games
-Priority: optional
-Architecture: all
-Multi-Arch: foreign
-Recommends: openjk-academy
-Installed-Size: 500000
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Description: Star Wars Jedi Knight: Jedi Academy data files
  Jedi Academy requires an engine and game data to play. This
  package contains the data from the full version of Jedi Academy,
diff --git a/data/jedi-outcast-data.control.in b/data/jedi-outcast-data.control.in
index 341604b..e2fbeb3 100644
--- a/data/jedi-outcast-data.control.in
+++ b/data/jedi-outcast-data.control.in
@@ -1,12 +1,3 @@
-Package: jedi-outcast-data
-Version: 1.04+VERSION
-Section: non-free/games
-Priority: optional
-Architecture: all
-Multi-Arch: foreign
-Recommends: openjk-outcast
-Installed-Size: 500000
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Description: Star Wars Jedi Knight II: Jedi Outcast data files
  Jedi Knight II requires an engine and game data to play. This
  package contains the data from the full version of Jedi Knight II,
diff --git a/data/jk2.yaml b/data/jk2.yaml
index db92dc8..2965cf7 100644
--- a/data/jk2.yaml
+++ b/data/jk2.yaml
@@ -35,6 +35,9 @@ packages:
       # programatically)
       571340734 3764210 base/assets2.pk3
       2217997310 550829 base/assets5.pk3
+    debian:
+      engine: openjk-outcast
+      version: '1.04'
 
 md5sums: |
   bbd8243669d551c910cfe60ccb4e5edd  base/assets0.pk3

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git