[game-data-packager] 08/10: fix remaining merge fallout

[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 e45f0bf63f4734debdec5c95a8f6daeedfc71b4e
Author: Alexandre Detiste <alexandre.detiste at gmail.com>
Date:   Sun Jan 18 09:23:44 2015 +0100

    fix remaining merge fallout
---
 data/doom.yaml       | 4 +---
 data/doom2.yaml      | 4 +---
 data/final-doom.yaml | 8 ++------
 data/wolf3d.yaml     | 2 --
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/data/doom.yaml b/data/doom.yaml
index 9419f29..b8b36f1 100644
--- a/data/doom.yaml
+++ b/data/doom.yaml
@@ -23,13 +23,11 @@ help_text: |
 packages:
   doom-wad:
     debian:
-      engine: chocolate-doom | doom-engine
+      engine: "chocolate-doom | doom-engine"
     install_to: usr/share/games/doom
     longname: Doom
     install:
     - doom.wad
-    debian:
-      engine: "chocolate-doom | doom-engine"
 
 files:
   # full version
diff --git a/data/doom2.yaml b/data/doom2.yaml
index 6a4dc6e..537b8c5 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -17,13 +17,11 @@ help_text: |
 packages:
   doom2-wad:
     debian:
-      engine: chocolate-doom | doom-engine
+      engine: "chocolate-doom | doom-engine"
       provides: doom-wad
     install_to: usr/share/games/doom
     install:
     - doom2.wad
-    debian:
-      engine: "chocolate-doom | doom-engine"
 
 files:
   doom2.wad:
diff --git a/data/final-doom.yaml b/data/final-doom.yaml
index cc4caef..8ac4fa3 100644
--- a/data/final-doom.yaml
+++ b/data/final-doom.yaml
@@ -17,24 +17,20 @@ packages:
     # you don't need Doom or Doom II to play them
     longname: "Final Doom: TNT: Evilution"
     debian:
-      engine: chocolate-doom | doom-engine
+      engine: "chocolate-doom | doom-engine"
       provides: doom-wad
     install:
     - tnt.wad
     install_to: usr/share/games/doom
-    debian:
-      engine: "chocolate-doom | doom-engine"
 
   plutonia-wad:
     longname: "Final Doom: The Plutonia Experiment"
     debian:
-      engine: chocolate-doom | doom-engine
+      engine: "chocolate-doom | doom-engine"
       provides: doom-wad
     install:
     - plutonia.wad
     install_to: usr/share/games/doom
-    debian:
-      engine: "chocolate-doom | doom-engine"
 
 files:
   tnt.wad:
diff --git a/data/wolf3d.yaml b/data/wolf3d.yaml
index 05e3b74..a3c87f8 100644
--- a/data/wolf3d.yaml
+++ b/data/wolf3d.yaml
@@ -44,8 +44,6 @@ packages:
     - vswap.wl6
     optional:
     - LICENSE.DOC_wl6a
-    debian:
-      engine: wolf4sdl
 
 files:
   1wolf14.zip:

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