[game-data-packager] 04/06: Convert all games to new syntax for context-sensitive dependencies

Simon McVittie smcv at debian.org
Mon Jan 25 01:14:29 UTC 2016


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 c77b9eb68c4f72ecf887fb2b432bc69d1fe90ccf
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 25 00:21:17 2016 +0000

    Convert all games to new syntax for context-sensitive dependencies
    
    This can remove quite a lot of redundancy, because we now do things
    like mapping "libfoo.so.0 (>= 6)" to "libfoo0 (>= 6)" for dpkg
    or "libfoo.so.0 >= 6" for RPM.
---
 data/arx.yaml              | 15 +++-----
 data/compet-n.yaml         |  7 ++--
 data/descent1.yaml         |  6 ++--
 data/descent2.yaml         |  3 +-
 data/doom.yaml             |  5 +--
 data/doom2.yaml            | 16 +++++----
 data/dune2.yaml            |  8 ++---
 data/etqw.yaml             | 24 ++++++-------
 data/final-doom.yaml       | 14 ++++----
 data/freespace2.yaml       |  7 ++--
 data/heretic.yaml          |  7 ++--
 data/hexen.yaml            | 16 ++++-----
 data/larry1.yaml           |  4 +--
 data/larry2.yaml           |  4 +--
 data/larry3.yaml           |  4 +--
 data/larry5.yaml           |  4 +--
 data/larry6.yaml           |  4 +--
 data/lgeneral.yaml         |  3 +-
 data/quake.yaml            |  8 ++---
 data/quake2.yaml           | 29 ++++++++--------
 data/quake3.yaml           |  3 +-
 data/quake4.yaml           | 38 ++++++++-------------
 data/rott.yaml             |  3 +-
 data/spear-of-destiny.yaml | 12 +++----
 data/theme-hospital.yaml   |  6 ++--
 data/unreal.yaml           | 85 +++++++++++++++-------------------------------
 data/wolf3d.yaml           |  8 ++---
 data/zork-inquisitor.yaml  |  4 +--
 data/zork-nemesis.yaml     |  4 +--
 29 files changed, 148 insertions(+), 203 deletions(-)

diff --git a/data/arx.yaml b/data/arx.yaml
index 33d2fba..f2ba00b 100644
--- a/data/arx.yaml
+++ b/data/arx.yaml
@@ -20,8 +20,7 @@ missing_langs: [de,fr,ja]
 packages:
   arx-fatalis-en-data:
     install_to: usr/share/games/arx
-    debian:
-      replaces: arx-fatalis-demo-data
+    replaces: arx-fatalis-demo-data
     provides: arx-fatalis-data
     mutually_exclusive: True
     steam:
@@ -38,8 +37,7 @@ packages:
   arx-fatalis-demo-en-data:
     install_to: usr/share/games/arx
     demo_for: arx-fatalis-en-data
-    debian:
-      conflicts: arx-fatalis-data
+    conflicts: arx-fatalis-data
     provides: arx-fatalis-demo-data
     mutually_exclusive: True
     install:
@@ -54,8 +52,7 @@ packages:
     install_to: usr/share/games/arx
     # XXX need to package arx-fatalis-fr-data
     demo_for: arx-fatalis-en-data
-    debian:
-      conflicts: arx-fatalis-data
+    conflicts: arx-fatalis-data
     provides: arx-fatalis-demo-data
     mutually_exclusive: True
     install:
@@ -70,8 +67,7 @@ packages:
     install_to: usr/share/games/arx
     # XXX need to package arx-fatalis-de-data
     demo_for: arx-fatalis-en-data
-    debian:
-      conflicts: arx-fatalis-data
+    conflicts: arx-fatalis-data
     provides: arx-fatalis-demo-data
     mutually_exclusive: True
     install:
@@ -86,8 +82,7 @@ packages:
     install_to: usr/share/games/arx
     # XXX need to package arx-fatalis-ja-data
     demo_for: arx-fatalis-en-data
-    debian:
-      conflicts: arx-fatalis-data
+    conflicts: arx-fatalis-data
     provides: arx-fatalis-demo-data
     mutually_exclusive: True
     install:
diff --git a/data/compet-n.yaml b/data/compet-n.yaml
index 7dd8cfa..714f15d 100644
--- a/data/compet-n.yaml
+++ b/data/compet-n.yaml
@@ -19,8 +19,11 @@ packages:
   doom-compet-n-data:
     # mostly, for 5 of 6 PWADS
     expansion_for_ext: doom2-wad
-    debian:
-      recommends: ["doom2-wad | freedoom", "doom-wad | freedoom"]
+    recommends:
+      - deb: "doom2-wad | freedoom"
+        generic: doom2-wad
+      - deb: "doom-wad | freedoom"
+        generic: doom-wad
     main_wads:
       av.wad:
          name: Alien Vendetta (2nd Ed.)
diff --git a/data/descent1.yaml b/data/descent1.yaml
index ddd7a1e..487f955 100644
--- a/data/descent1.yaml
+++ b/data/descent1.yaml
@@ -9,8 +9,7 @@ packages:
   descent1-demo-data:
     demo_for: descent1-data
     mutually_exclusive: True
-    debian:
-      conflicts: descent1-full-data
+    conflicts: descent1-full-data
     install_to: usr/share/games/d1x-rebirth/
     copyright_notice: |
       DESCENT is a trademark of Interplay Productions, Inc.
@@ -33,8 +32,7 @@ packages:
     - refcard.txt
 
   descent1-data:
-    debian:
-      replaces: descent1-full-data
+    replaces: descent1-full-data
     gog:
       # http://www.gog.com/game/${url}?pp=${pp}
       url: descent_1_descent_2
diff --git a/data/descent2.yaml b/data/descent2.yaml
index 436e670..39942ea 100644
--- a/data/descent2.yaml
+++ b/data/descent2.yaml
@@ -20,8 +20,7 @@ packages:
     steam:
       id: 273580
       path: "common/Descent 2"
-    debian:
-      replaces: descent2-full-data
+    replaces: descent2-full-data
     install_to: usr/share/games/d2x-rebirth
     install:
     - full game assets
diff --git a/data/doom.yaml b/data/doom.yaml
index dd01bd7..42a243b 100644
--- a/data/doom.yaml
+++ b/data/doom.yaml
@@ -23,8 +23,9 @@ help_text: |
 
 packages:
   doom-wad:
-    debian:
-      conflicts: [freedoom (<< 0.6.4-4), freedm (<< 0.6.4-4)]
+    conflicts:
+      - "freedoom (<< 0.6.4-4)"
+      - "freedm (<< 0.6.4-4)"
     steam:
       id: 2280
       path: "common/Ultimate Doom"
diff --git a/data/doom2.yaml b/data/doom2.yaml
index 9bf2d02..e15cb57 100644
--- a/data/doom2.yaml
+++ b/data/doom2.yaml
@@ -19,9 +19,10 @@ help_text: |
 packages:
   doom2-wad:
     langs: [en,fr]
-    debian:
-      provides: doom-wad
-      conflicts: ["freedoom (<< 0.6.4-4)", "freedm (<< 0.6.4-4)"]
+    provides: doom-wad
+    conflicts:
+      - "freedoom (<< 0.6.4-4)"
+      - "freedm (<< 0.6.4-4)"
     steam:
       id: 2300
       path: "common/Doom 2"
@@ -59,9 +60,12 @@ packages:
     gog:
       url: doom_ii_final_doom
       game: doom_ii_master_levels_game
-    debian:
-      depends: doom2-wad | freedoom
-      recommends: game-data-packager
+    depends:
+      - deb: doom2-wad | freedoom
+        generic: doom2-wad
+    recommends:
+      - rpm: doom2-masterlevels
+        generic: game-data-packager
     symlinks:
       $install_to/doom2-masterlevels-tryexec: etc/alternatives/doom
     install:
diff --git a/data/dune2.yaml b/data/dune2.yaml
index d8d9df0..64d5b02 100644
--- a/data/dune2.yaml
+++ b/data/dune2.yaml
@@ -12,9 +12,8 @@ packages:
   dune2-demo-data:
     # https://archive.org/download/DuneIiTheBuildingOfADynastyDemo/dune2.zip
     DISABLED: demo not supported
-    debian:
-      provides: dune2-data
-      conflicts: dune2-data
+    provides: dune2-data
+    conflicts: dune2-data
     demo_for:
     - dune2-v10-data
     - dune2-v17-us-data
@@ -33,8 +32,7 @@ packages:
   dune2-v10-data:
     longname: "Dune II (v1.00/US)"
     provides: dune2-data
-    debian:
-      conflicts: dune2-data
+    conflicts: dune2-data
     install_to: usr/share/games/dunelegacy
     install:
     - ATRE.PAK
diff --git a/data/etqw.yaml b/data/etqw.yaml
index b761ce9..bd37e7d 100644
--- a/data/etqw.yaml
+++ b/data/etqw.yaml
@@ -19,10 +19,8 @@ packages:
     architecture: i386
     version: "1.5"
     depends:
-    - etqw-bin
-    debian:
-      depends:
-      - libc6 (>= 2.1)
+      - etqw-bin
+      - libc.so.6 (>= 2.1)
     install:
     - patch 1.5 Punkbuster binaries
     doc:
@@ -36,16 +34,14 @@ packages:
     architecture: i386
     version: "1.5"
     depends:
-    - etqw-data
-    debian:
-      depends:
-      - libc6 (>= 2.2.4)
-      - libgcc1 (>= 4.1.2)
-      - libjpeg62-turbo
-      - libsdl1.2debian (>= 1.2.10)
-      - libstdc++6 (>= 4.1.2)
-      - xdg-utils
-      suggests:
+      - etqw-data
+      - libc.so.6 (>= 2.2.4)
+      - libgcc_s.so.1 (>= 4.1.2)
+      - libjpeg.so.62
+      - libSDL-1.2.so.0 (>= 1.2.10)
+      - libstdc++.so.6 (>= 4.1.2)
+      - deb: xdg-utils
+    suggests:
       - etqw-pb-bin
     install:
     - patch 1.4 to 1.5 - binaries
diff --git a/data/final-doom.yaml b/data/final-doom.yaml
index b6fb1e2..9f46c8b 100644
--- a/data/final-doom.yaml
+++ b/data/final-doom.yaml
@@ -25,9 +25,10 @@ packages:
     # you don't need Doom or Doom II to play them
     longname: "Final Doom: TNT: Evilution"
     aliases: [tnt, t]
-    debian:
-      provides: doom-wad
-      conflicts: ["freedoom (<< 0.6.4-4)", "freedm (<< 0.6.4-4)"]
+    provides: doom-wad
+    conflicts:
+      - "freedoom (<< 0.6.4-4)"
+      - "freedm (<< 0.6.4-4)"
     install:
     - tnt.wad
     - tnt31.wad
@@ -40,9 +41,10 @@ packages:
   plutonia-wad:
     longname: "Final Doom: The Plutonia Experiment"
     aliases: [plutonia, p]
-    debian:
-      provides: doom-wad
-      conflicts: ["freedoom (<< 0.6.4-4)", "freedm (<< 0.6.4-4)"]
+    provides: doom-wad
+    conflicts:
+      - "freedoom (<< 0.6.4-4)"
+      - "freedm (<< 0.6.4-4)"
     install:
     - plutonia.wad
     doc:
diff --git a/data/freespace2.yaml b/data/freespace2.yaml
index f9f9cad..370499f 100644
--- a/data/freespace2.yaml
+++ b/data/freespace2.yaml
@@ -22,10 +22,9 @@ copyright: © 1999 Volition, Inc.
 packages:
   freespace2-data:
     install_to: usr/share/games/freespace2-open
-    debian:
-      replaces:
-        - freespace2-data-gog
-        - freespace2-data-volition
+    replaces:
+      - freespace2-data-gog
+      - freespace2-data-volition
     steam:
       id: 273620
       path: common/Freespace 2
diff --git a/data/heretic.yaml b/data/heretic.yaml
index ee60870..ad094ab 100644
--- a/data/heretic.yaml
+++ b/data/heretic.yaml
@@ -22,8 +22,8 @@ help_text: |
 
 packages:
   heretic-wad:
-    debian:
-      breaks: chocolate-doom (<< 2)
+    breaks:
+      - deb: chocolate-doom (<< 2)
     steam:
       id: 2390
       path: "common/Heretic Shadow of the Serpent Riders"
@@ -38,8 +38,7 @@ packages:
     longname: "Heretic (shareware)"
     demo_for: heretic-wad
     component: non-free
-    debian:
-      replaces: heretic-shareware-data
+    replaces: heretic-shareware-data
     fedora:
       engine: chocolate-doom
     suse:
diff --git a/data/hexen.yaml b/data/hexen.yaml
index dd2c195..60a9de3 100644
--- a/data/hexen.yaml
+++ b/data/hexen.yaml
@@ -24,8 +24,8 @@ engine: "chocolate-hexen | hexen-engine"
 
 packages:
   hexen-wad:
-    debian:
-      breaks: chocolate-doom (<< 2)
+    breaks:
+      - deb: chocolate-doom (<< 2)
     steam:
       id: 2360
       path: "common/Hexen"
@@ -39,9 +39,9 @@ packages:
   hexen-deathkings-wad:
     longname: "Hexen: Deathkings of the Dark Citadel"
     wiki: Hexen:_Deathkings_of_the_Dark_Citadel
-    debian:
-      breaks: chocolate-doom (<< 2)
-      replaces: hexen-deathkings-data
+    breaks:
+      - deb: chocolate-doom (<< 2)
+    replaces: hexen-deathkings-data
     fedora:
       engine: chocolate-doom
     suse:
@@ -55,9 +55,9 @@ packages:
 
   hexen-demo-wad:
     longname: "Hexen: Beyond Heretic (demo)"
-    debian:
-      replaces: hexen-demo-data
-      breaks: chocolate-doom (<< 2.2.0)
+    replaces: hexen-demo-data
+    breaks:
+      - deb: chocolate-doom (<< 2.2.0)
     fedora:
       engine: chocolate-doom
     suse:
diff --git a/data/larry1.yaml b/data/larry1.yaml
index da3326f..7c951ac 100644
--- a/data/larry1.yaml
+++ b/data/larry1.yaml
@@ -61,8 +61,8 @@ packages:
     copyright: © 1987-1994 Sierra On-Line
     section: doc
     expansion_for: larry1-data
-    debian:
-      depends: larry1-data | larry1-vga-data | larry2-data | larry3-data | larry5-data | larry6-data
+    depends:
+      deb: larry1-data | larry1-vga-data | larry2-data | larry3-data | larry5-data | larry6-data
     install:
     - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 
diff --git a/data/larry2.yaml b/data/larry2.yaml
index bcf00bf..93ccd56 100644
--- a/data/larry2.yaml
+++ b/data/larry2.yaml
@@ -26,8 +26,8 @@ packages:
     copyright: © 1987-1994 Sierra On-Line
     section: doc
     expansion_for: larry2-data
-    debian:
-      depends: larry1-data | larry1-vga-data | larry2-data | larry3-data | larry5-data | larry6-data
+    depends:
+      deb: larry1-data | larry1-vga-data | larry2-data | larry3-data | larry5-data | larry6-data
     install:
     - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 
diff --git a/data/larry3.yaml b/data/larry3.yaml
index 2a774a6..a8c81b0 100644
--- a/data/larry3.yaml
+++ b/data/larry3.yaml
@@ -29,8 +29,8 @@ packages:
     copyright: © 1987-1994 Sierra On-Line
     section: doc
     expansion_for: larry3-en-data
-    debian:
-      depends: larry1-data | larry1-vga-data | larry2-data | larry3-data | larry5-data | larry6-data
+    depends:
+      deb: larry1-data | larry1-vga-data | larry2-data | larry3-data | larry5-data | larry6-data
     install:
     - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 
diff --git a/data/larry5.yaml b/data/larry5.yaml
index a5391f8..57a2d3f 100644
--- a/data/larry5.yaml
+++ b/data/larry5.yaml
@@ -44,8 +44,8 @@ packages:
     copyright: © 1987-1994 Sierra On-Line
     expansion_for: larry5-en-data
     section: doc
-    debian:
-      depends: larry1-data | larry1-vga-data | larry2-data | larry3-data | larry5-data | larry6-data
+    depends:
+      deb: larry1-data | larry1-vga-data | larry2-data | larry3-data | larry5-data | larry6-data
     install:
     - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 
diff --git a/data/larry6.yaml b/data/larry6.yaml
index aae643f..31c3597 100644
--- a/data/larry6.yaml
+++ b/data/larry6.yaml
@@ -33,8 +33,8 @@ packages:
     copyright: © 1987-1994 Sierra On-Line
     expansion_for: larry6-data
     section: doc
-    debian:
-      depends: larry1-data | larry1-vga-data | larry2-data | larry3-data | larry5-data | larry6-data
+    depends:
+      deb: larry1-data | larry1-vga-data | larry2-data | larry3-data | larry5-data | larry6-data
     install:
     - Leisure Suit Larrys Greatest Hits and Misses - Manual.pdf
 
diff --git a/data/lgeneral.yaml b/data/lgeneral.yaml
index 97d26d9..0ba997d 100644
--- a/data/lgeneral.yaml
+++ b/data/lgeneral.yaml
@@ -12,8 +12,7 @@ packages:
   lgeneral-data-nonfree:
     longname: Panzer General data for LGeneral
     install_to: usr/share/games/lgeneral
-    debian:
-      build_depends: lgc-pg
+    build_depends: lgc-pg
     # pg-data.tar.gz is not actually needed, but it's small, and putting it
     # in the .deb means we can easily repack it if lgc-pg changes
     #
diff --git a/data/quake.yaml b/data/quake.yaml
index 0751d32..da89c07 100644
--- a/data/quake.yaml
+++ b/data/quake.yaml
@@ -33,8 +33,7 @@ packages:
     mutually_exclusive: True
     longname: Quake (shareware)
     component: non-free
-    debian:
-      provides: quake-data
+    provides: quake-data
     install:
     - id1/pak0.pak?106
     license:
@@ -43,10 +42,7 @@ packages:
     install_to: usr/share/games/quake
 
   quake-registered:
-    debian:
-      provides: quake-data
-      # "replaces: quake-shareware" is implied by 'mutually_exclusive:'
-      # & 'demo_for:' tags on 'quake-shareware'
+    provides: quake-data
     steam:
       id: 2310
       path: common/Quake
diff --git a/data/quake2.yaml b/data/quake2.yaml
index 2b85d7e..a6d7339 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -34,8 +34,7 @@ help_text: |
 packages:
   quake2-full-data:
     longname: Quake II
-    debian:
-      replaces: quake2-data
+    replaces: quake2-data
     steam:
       id: 2320
       path: "common/Quake 2"
@@ -110,12 +109,13 @@ packages:
     steam:
       id: 2330
       path: "common/Quake 2/xatrix"
-    debian:
-      build_depends: [gcc, make, libc6-dev]
-      provides: quake2-xatrix
-      replaces: quake2-xatrix
-    fedora:
-      build_depends: [gcc, make, glibc-devel]
+    build_depends:
+      - gcc
+      - make
+      - deb: libc6-dev
+        rpm: glibc-devel
+    provides: quake2-xatrix
+    replaces: quake2-xatrix
     expansion_for: quake2-full-data
     # this is what Makefile says has been tested
     architecture: amd64 i386 ia64 sparc64
@@ -166,12 +166,13 @@ packages:
       path: "common/Quake 2/rogue"
     gog:
       url: quake_ii_quad_damage
-    debian:
-      build_depends: [gcc, make, libc6-dev]
-      provides: quake2-rogue
-      replaces: quake2-rogue
-    fedora:
-      build_depends: [gcc, make, glibc-devel]
+    build_depends:
+      - gcc
+      - make
+      - deb: libc6-dev
+        rpm: glibc-devel
+    provides: quake2-rogue
+    replaces: quake2-rogue
     expansion_for: quake2-full-data
     # this is what Makefile says has been tested
     architecture: amd64 i386 ia64 sparc64
diff --git a/data/quake3.yaml b/data/quake3.yaml
index 8180a79..bd5e57a 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -140,8 +140,7 @@ packages:
     gog:
       url: quake_iii_gold
     expansion_for: quake3-data
-    debian:
-      depends: quake3-data (>= 38)
+    depends: quake3-data (>= 38)
     install:
     - missionpack/pak0.pk3
     symlinks:
diff --git a/data/quake4.yaml b/data/quake4.yaml
index 7824d61..7d52af6 100644
--- a/data/quake4.yaml
+++ b/data/quake4.yaml
@@ -21,9 +21,7 @@ packages:
     version: "1.4.2"
     depends:
       - quake4-bin
-    debian:
-      depends:
-        - libc6 (>= 2.1)
+      - libc.so.6 (>= 2.1)
     doc:
       - patch 1.4.2 Punkbuster documentation
     install:
@@ -37,16 +35,16 @@ packages:
     install_to: usr/lib/quake4
     architecture: i386
     version: "1.4.2"
-    debian:
-      depends:
-        - libc6 (>= 2.2.4)
-        - libgcc1 (>= 4.1.2)
-        - libsdl1.2debian (>= 1.2.10)
-        - libstdc++6 (>= 4.1.2)
-        - quake4-data | quake4-censored-de-data
-        - xdg-utils
-      suggests:
-        - quake4-pb-bin
+    depends:
+      - libc.so.6 (>= 2.2.4)
+      - libgcc_s.so.1 (>= 4.1.2)
+      - libSDL-1.2.so.0 (>= 1.2.10)
+      - libstdc++.so.6 (>= 4.1.2)
+      - deb: quake4-data | quake4-censored-de-data
+        generic: quake4-any-data
+      - deb: xdg-utils
+    suggests:
+      - quake4-pb-bin
     install:
       - patch 1.4.2 binaries
     symlinks:
@@ -64,13 +62,8 @@ packages:
 
   quake4-data:
     version: "1.4.2"
-    debian:
-      provides: quake4-any-data
-      replaces: quake4-any-data
-      #conflicts: quake4-any-data
-      # This is extraneous because the 'replaces' set
-      # is always added to the 'conflicts' set.
-      #   dep['conflicts'] |= dep['replaces']
+    provides: quake4-any-data
+    replaces: quake4-any-data
     langs:
       - en
       - cs
@@ -98,9 +91,8 @@ packages:
   quake4-censored-de-data:
     longname: Quake 4 (censored German version)
     version: "1.4.2"
-    debian:
-      provides: quake4-any-data
-      replaces: quake4-any-data
+    provides: quake4-any-data
+    replaces: quake4-any-data
     install_to: usr/share/games/quake4
     # this is not actually dubbed, just censored
     langs:
diff --git a/data/rott.yaml b/data/rott.yaml
index a8fd174..fab0657 100644
--- a/data/rott.yaml
+++ b/data/rott.yaml
@@ -26,8 +26,7 @@ packages:
     # it includes the HUNT Begin levels not present in the commercial game
     description: |
       Use the 'rott-shareware' command to play this game.
-    debian:
-      suggests: rott-registered-data
+    suggests: rott-registered-data
     fedora:
       engine: rott-shareware
     install:
diff --git a/data/spear-of-destiny.yaml b/data/spear-of-destiny.yaml
index 2874a6f..bf526b7 100644
--- a/data/spear-of-destiny.yaml
+++ b/data/spear-of-destiny.yaml
@@ -60,13 +60,13 @@ packages:
     description: |
       This package provides the assets shared by the 3 mission packs
       of Spear of Destiny, the sequel of Wolfenstein 3D, but has no use alone.
-    debian:
-      depends: spear-of-destiny-mission1-data | spear-of-destiny-mission2-data | spear-of-destiny-mission3-data
+    depends:
+      deb: spear-of-destiny-mission1-data | spear-of-destiny-mission2-data | spear-of-destiny-mission3-data
+      generic: spear-of-destiny-mission-pack
     install_to: usr/share/games/wolf3d
     fedora:
       engine: wolf4sdl-spear
       install_to: usr/share/spear/full
-      depends: spear-of-destiny-mission-pack
     install:
     - audiohed.sod
     - audiot.sod
@@ -84,7 +84,7 @@ packages:
     install_to: usr/share/games/wolf3d
     fedora:
       install_to: usr/share/spear/full
-      provides: spear-of-destiny-mission-pack
+    provides: spear-of-destiny-mission-pack
     install:
     - gamemaps.sd1
     - maphead.sd1
@@ -102,7 +102,7 @@ packages:
     install_to: usr/share/games/wolf3d
     fedora:
       install_to: usr/share/spear/full
-      provides: spear-of-destiny-mission-pack
+    provides: spear-of-destiny-mission-pack
     install:
     - gamemaps.sd2
     - maphead.sd2
@@ -116,7 +116,7 @@ packages:
     install_to: usr/share/games/wolf3d
     fedora:
       install_to: usr/share/spear/full
-      provides: spear-of-destiny-mission-pack
+    provides: spear-of-destiny-mission-pack
     install:
     - gamemaps.sd3
     - maphead.sd3
diff --git a/data/theme-hospital.yaml b/data/theme-hospital.yaml
index 8ade621..08c9bd7 100644
--- a/data/theme-hospital.yaml
+++ b/data/theme-hospital.yaml
@@ -25,8 +25,7 @@ help_text: |
 packages:
   theme-hospital-data:
     langs: [en,da,de,es,fi,fr,it,nb,nl,pt,sv]
-    debian:
-      replaces: theme-hospital-full-data
+    replaces: theme-hospital-full-data
     gog:
       url: theme_hospital
     origin:
@@ -50,8 +49,7 @@ packages:
     install_to: usr/share/games/theme-hospital
     demo_for: theme-hospital-data
     mutually_exclusive: True
-    debian:
-      conflicts: theme-hospital-full-data
+    conflicts: theme-hospital-full-data
     install:
     - demo version
     symlinks:
diff --git a/data/unreal.yaml b/data/unreal.yaml
index f882c16..d08fb23 100644
--- a/data/unreal.yaml
+++ b/data/unreal.yaml
@@ -58,18 +58,13 @@ packages:
       This empty package depends on that launcher and its runtime dependencies.
       It is a separate package so that the launcher can be installed for
       the native CPU architecture.
-    debian:
-      depends:
-        - "game-data-packager (>= 44)"
-        - gir1.2-gtk-3.0
-        - python3
-        - python3-gi
-    rpm:
-      depends:
-        - "game-data-packager >= 44"
-        - gtk3
-        - python3
-        - python3-gobject
+    depends:
+      - "game-data-packager (>= 44)"
+      - python3
+      - deb: gir1.2-gtk-3.0
+        rpm: gtk3
+      - deb: python3-gi
+        rpm: python3-gobject
     empty: true
 
   unreal-de-data:
@@ -247,27 +242,15 @@ packages:
       - unreal-launcher-dependencies
       - unreal-libfmod
       - unreal-libmikmod2
-    debian:
-      depends:
-        - libalut0
-        - libc6
-        - libgcc1
-        - libopenal1
-        - libsdl1.2debian
-        - libstdc++6
-      suggests:
-        # required by UnrealXLinux.bin which is not the default
-        - libxxf86dga1
-    rpm:
-      depends:
-        - libalut.so.0
-        - libc.so.6
-        - libgcc_s.so.1
-        - libopenal.so.1
-        - libSDL-1.2.so.0
-        - libstdc++.so.6
-      suggests:
-        - libXxf86dga.so.1
+      - libalut.so.0
+      - libc.so.6
+      - libgcc_s.so.1
+      - libopenal.so.1
+      - libSDL-1.2.so.0
+      - libstdc++.so.6
+    suggests:
+      # required by UnrealXLinux.bin which is not the default
+      - libXxf86dga.so.1
     install:
       - Unreal 227i common binaries
       - Unreal 227i common executables
@@ -289,8 +272,7 @@ packages:
       This package contains the version used by Unreal and Unreal Gold,
       installed to a location where it will be used by those games.
     architecture: i386
-    debian:
-      depends: libc6
+    depends: libc.so.6
     install:
       - libfmod-3.75.so
     symlinks:
@@ -309,8 +291,7 @@ packages:
       Unreal Gold, installed to a location where it will be used by
       those games.
     architecture: i386
-    debian:
-      depends: libc6
+    depends: libc.so.6
     install:
       - libmikmod.so.2.0.4
     symlinks:
@@ -329,27 +310,15 @@ packages:
       - unreal-launcher-dependencies
       - unreal-libfmod
       - unreal-libmikmod2
-    debian:
-      depends:
-        - libalut0
-        - libc6
-        - libgcc1
-        - libopenal1
-        - libsdl1.2debian
-        - libstdc++6
-      suggests:
-        # required by UnrealXLinux.bin which is not the default
-        - libxxf86dga1
-    rpm:
-      depends:
-        - libalut.so.0
-        - libc.so.6
-        - libgcc_s.so.1
-        - libopenal.so.1
-        - libSDL-1.2.so.0
-        - libstdc++.so.6
-      suggests:
-        - libXxf86dga.so.1
+      - libalut.so.0
+      - libc.so.6
+      - libgcc_s.so.1
+      - libopenal.so.1
+      - libSDL-1.2.so.0
+      - libstdc++.so.6
+    suggests:
+      # required by UnrealXLinux.bin which is not the default
+      - libXxf86dga.so.1
     install:
       # these are relatively small so we don't bother with a separate
       # unreal-classic-data package, and just put them in /usr/lib
diff --git a/data/wolf3d.yaml b/data/wolf3d.yaml
index 6ccb8d8..3d5decf 100644
--- a/data/wolf3d.yaml
+++ b/data/wolf3d.yaml
@@ -18,8 +18,7 @@ packages:
     - wolf3d-v14-id-data
     - wolf3d-v14-alt-data
     - wolf3d-v14-apogee-data
-    debian:
-      replaces: wolf3d-data-wl1
+    replaces: wolf3d-data-wl1
     install_to: usr/share/games/wolf3d
     install:
     - audiohed.wl1
@@ -137,9 +136,8 @@ packages:
        * Episode 4: Dark Secret
        * Episode 5: Trail of the Madman
        * Episode 6: Confrontation
-    debian:
-      provides: wolf3d-data
-      conflicts: wolf3d-data
+    provides: wolf3d-data
+    conflicts: wolf3d-data
     fedora:
       engine: wolf4sdl-registered-apogee
       install_to: usr/share/wolf3d/registered-apogee
diff --git a/data/zork-inquisitor.yaml b/data/zork-inquisitor.yaml
index edbd722..89ed442 100644
--- a/data/zork-inquisitor.yaml
+++ b/data/zork-inquisitor.yaml
@@ -47,8 +47,8 @@ packages:
   zork-grand-inquisitor-data:
     engine: scummvm (>= 1.8.0)    
     gameid: zgi-win
-    debian:
-      depends: fonts-liberation
+    depends:
+      - deb: fonts-liberation
     gog:
       url: zork_grand_inquisitor
     symlinks:
diff --git a/data/zork-nemesis.yaml b/data/zork-nemesis.yaml
index c5d2048..2982892 100644
--- a/data/zork-nemesis.yaml
+++ b/data/zork-nemesis.yaml
@@ -14,8 +14,8 @@ help_text:
 packages:
   zork-nemesis-data:
     engine: scummvm (>= 1.8.0)
-    debian:
-      depends: fonts-liberation
+    depends:
+      - deb: fonts-liberation
     gog:
       url: zork_nemesis_the_forbidden_lands
     symlinks:

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