[game-data-packager] 04/04: Consistently base install_to and symlinks on $assets

Simon McVittie smcv at debian.org
Wed Sep 28 00:18:27 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 43096f439d880a482d1d580a92cecdbec3075855
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Sep 27 23:13:24 2016 +0100

    Consistently base install_to and symlinks on $assets
    
    This should make things a bit more consistent on systems where
    /usr/share/games is not the right place in general.
---
 data/arx.yaml              | 10 +++++-----
 data/blakestone.yaml       |  2 +-
 data/descent1.yaml         |  4 ++--
 data/descent2.yaml         |  4 ++--
 data/doom3.yaml            |  6 +++---
 data/duke3d.yaml           |  4 ++--
 data/dune2.yaml            | 10 +++++-----
 data/enemy-territory.yaml  |  2 +-
 data/etqw.yaml             |  2 +-
 data/freespace2.yaml       |  6 +++---
 data/hexen2.yaml           |  6 +++---
 data/ja.yaml               |  4 ++--
 data/lgeneral.yaml         |  2 +-
 data/quake.yaml            | 16 ++++++++--------
 data/quake2.yaml           | 16 ++++++++--------
 data/quake3.yaml           | 36 ++++++++++++++++++------------------
 data/quake4.yaml           | 10 +++++-----
 data/rtcw.yaml             | 12 ++++++------
 data/spear-of-destiny.yaml | 10 +++++-----
 data/syndicate.yaml        |  4 ++--
 data/theme-hospital.yaml   |  2 +-
 data/ttd.yaml              |  4 ++--
 data/unreal.yaml           | 10 ++++++----
 data/wip/warcraft2.yaml    |  8 ++++----
 data/wolf3d.yaml           | 10 +++++-----
 25 files changed, 101 insertions(+), 99 deletions(-)

diff --git a/data/arx.yaml b/data/arx.yaml
index b94ba3b..12c501e 100644
--- a/data/arx.yaml
+++ b/data/arx.yaml
@@ -20,7 +20,7 @@ missing_langs: [de,fr,ja]
 
 packages:
   arx-fatalis-en-data:
-    install_to: usr/share/games/arx
+    install_to: $assets/arx
     replaces: arx-fatalis-demo-data
     provides: arx-fatalis-data
     mutually_exclusive: True
@@ -36,7 +36,7 @@ packages:
     - documentation
 
   arx-fatalis-demo-en-data:
-    install_to: usr/share/games/arx
+    install_to: $assets/arx
     demo_for: arx-fatalis-en-data
     conflicts: arx-fatalis-data
     provides: arx-fatalis-demo-data
@@ -50,7 +50,7 @@ packages:
 
   arx-fatalis-demo-fr-data:
     lang: fr
-    install_to: usr/share/games/arx
+    install_to: $assets/arx
     # XXX need to package arx-fatalis-fr-data
     demo_for: arx-fatalis-en-data
     conflicts: arx-fatalis-data
@@ -65,7 +65,7 @@ packages:
 
   arx-fatalis-demo-de-data:
     lang: de
-    install_to: usr/share/games/arx
+    install_to: $assets/arx
     # XXX need to package arx-fatalis-de-data
     demo_for: arx-fatalis-en-data
     conflicts: arx-fatalis-data
@@ -80,7 +80,7 @@ packages:
 
   arx-fatalis-demo-ja-data:
     lang: ja
-    install_to: usr/share/games/arx
+    install_to: $assets/arx
     # XXX need to package arx-fatalis-ja-data
     demo_for: arx-fatalis-en-data
     conflicts: arx-fatalis-data
diff --git a/data/blakestone.yaml b/data/blakestone.yaml
index 47dc49d..83306ff 100644
--- a/data/blakestone.yaml
+++ b/data/blakestone.yaml
@@ -108,7 +108,7 @@ packages:
     longname: "Blake Stone: Planet Strike"
     engine: bstone | ecwolf
     copyright: © 1994 JAM Productions
-    install_to: usr/share/games/blakestone
+    install_to: $assets/blakestone
     gog:
       url: blake_stone_planet_strike
     steam:
diff --git a/data/descent1.yaml b/data/descent1.yaml
index 487f955..d227bc1 100644
--- a/data/descent1.yaml
+++ b/data/descent1.yaml
@@ -10,7 +10,7 @@ packages:
     demo_for: descent1-data
     mutually_exclusive: True
     conflicts: descent1-full-data
-    install_to: usr/share/games/d1x-rebirth/
+    install_to: $assets/d1x-rebirth/
     copyright_notice: |
       DESCENT is a trademark of Interplay Productions, Inc.
       .
@@ -43,7 +43,7 @@ packages:
     steam:
       id: 273570
       path: common/Descent
-    install_to: usr/share/games/d1x-rebirth/
+    install_to: $assets/d1x-rebirth/
     install:
     - descent.hog
     - descent.pig
diff --git a/data/descent2.yaml b/data/descent2.yaml
index 39942ea..002a25d 100644
--- a/data/descent2.yaml
+++ b/data/descent2.yaml
@@ -8,7 +8,7 @@ genre: Flight simulator
 packages:
   descent2-demo-data:
     demo_for: descent2-data
-    install_to: usr/share/games/d2x-rebirth
+    install_to: $assets/d2x-rebirth
     install:
     - demo assets
 
@@ -21,7 +21,7 @@ packages:
       id: 273580
       path: "common/Descent 2"
     replaces: descent2-full-data
-    install_to: usr/share/games/d2x-rebirth
+    install_to: $assets/d2x-rebirth
     install:
     - full game assets
     optional:
diff --git a/data/doom3.yaml b/data/doom3.yaml
index 8d4e315..07bb686 100644
--- a/data/doom3.yaml
+++ b/data/doom3.yaml
@@ -27,7 +27,7 @@ packages:
     steam:
       id: 9070
       path: common/Doom 3
-    install_to: usr/share/games/doom3
+    install_to: $assets/doom3
     install:
       - d3xp data
       - d3xp patch
@@ -39,7 +39,7 @@ packages:
     longname: 'Classic Doom 3 (mod)'
     copyright: © 2007 id Software
     expansion_for: doom3-data
-    install_to: usr/share/games/doom3
+    install_to: $assets/doom3
     install:
       - Classic Doom data
     optional:
@@ -53,7 +53,7 @@ packages:
     longname: 'Classic Doom 3 (devkit)'
     copyright: © 2007 id Software
     expansion_for: doom3-classic-data
-    install_to: usr/share/games/doom3
+    install_to: $assets/doom3
     install:
       - Classic Doom source
 
diff --git a/data/duke3d.yaml b/data/duke3d.yaml
index c9b3306..582d849 100644
--- a/data/duke3d.yaml
+++ b/data/duke3d.yaml
@@ -12,7 +12,7 @@ help_text: |
 
 packages:
   duke3d-shareware:
-    install_to: usr/share/games/eduke32
+    install_to: $assets/eduke32
     demo_for: duke3d-data
     mutually_exclusive: True
     version: '1.3d'
@@ -24,7 +24,7 @@ packages:
     - license.txt?demo
 
   duke3d-data:
-    install_to: usr/share/games/eduke32
+    install_to: $assets/eduke32
     steam:
       id: 225140
       path: common/Duke Nukem 3D/gameroot/classic
diff --git a/data/dune2.yaml b/data/dune2.yaml
index 32ef9fc..0a9fbef 100644
--- a/data/dune2.yaml
+++ b/data/dune2.yaml
@@ -19,7 +19,7 @@ packages:
     - dune2-v17-us-data
     - dune2-v17-eu-data
     - dune2-v17-hs-data
-    install_to: usr/share/games/dunelegacy
+    install_to: $assets/dunelegacy
     install:
     - ATRE.PAK?demo
     - DUNE.PAK?demo
@@ -33,7 +33,7 @@ packages:
     longname: "Dune II (v1.00/US)"
     provides: dune2-data
     conflicts: dune2-data
-    install_to: usr/share/games/dunelegacy
+    install_to: $assets/dunelegacy
     install:
     - ATRE.PAK
     - DUNE.PAK
@@ -53,7 +53,7 @@ packages:
     longname: "Dune II (v1.07/US)"
     provides: dune2-data
     mutually_exclusive: True
-    install_to: usr/share/games/dunelegacy
+    install_to: $assets/dunelegacy
     install:
     - ATRE.PAK
     - DUNE.PAK?us_1.07
@@ -74,7 +74,7 @@ packages:
     langs: [en,de,fr]
     provides: dune2-data
     mutually_exclusive: True
-    install_to: usr/share/games/dunelegacy
+    install_to: $assets/dunelegacy
     install:
     - ATRE.PAK
     - DUNE.PAK?eu_1.07
@@ -98,7 +98,7 @@ packages:
     langs: [en,de,fr]
     provides: dune2-data
     mutually_exclusive: True
-    install_to: usr/share/games/dunelegacy
+    install_to: $assets/dunelegacy
     install:
     - ATRE.PAK
     - DUNE.PAK?hs_1.07
diff --git a/data/enemy-territory.yaml b/data/enemy-territory.yaml
index 94d25a2..03e7dd9 100644
--- a/data/enemy-territory.yaml
+++ b/data/enemy-territory.yaml
@@ -14,7 +14,7 @@ help_text: |
 
 packages:
   enemy-territory-data:
-    install_to: usr/share/games/etlegacy
+    install_to: $assets/etlegacy
     install:
     - etmain/pak0.pk3
     - etmain/pak1.pk3
diff --git a/data/etqw.yaml b/data/etqw.yaml
index bd37e7d..0b1fa44 100644
--- a/data/etqw.yaml
+++ b/data/etqw.yaml
@@ -50,7 +50,7 @@ packages:
     license:
     - patch 1.4 to 1.5 - licenses
     symlinks:
-      usr/lib/etqw/base: usr/share/games/etqw/base
+      usr/lib/etqw/base: $assets/etqw/base
       # The bundled implementation isn't great, and xdg-open is
       # binary-compatible
       usr/lib/etqw/openurl.sh: usr/bin/xdg-open
diff --git a/data/freespace2.yaml b/data/freespace2.yaml
index 370499f..66104af 100644
--- a/data/freespace2.yaml
+++ b/data/freespace2.yaml
@@ -21,7 +21,7 @@ try_repack_from: [usr/share/games/freespace2-open/packages/freespace2-data-gog/d
 copyright: © 1999 Volition, Inc.
 packages:
   freespace2-data:
-    install_to: usr/share/games/freespace2-open
+    install_to: $assets/freespace2-open
     replaces:
       - freespace2-data-gog
       - freespace2-data-volition
@@ -53,7 +53,7 @@ packages:
   freespace2-orig-video:
     expansion_for: freespace2-data
     longname: "FreeSpace 2 - cutscenes in original format"
-    install_to: usr/share/games/freespace2-open/data/movies
+    install_to: $assets/freespace2-open/data/movies
     install:
     - INTRO.MVE
     - original movies
@@ -61,7 +61,7 @@ packages:
   freespace2-ogg-video:
     expansion_for: freespace2-data
     longname: "FreeSpace 2 - cutscenes in OGG format"
-    install_to: usr/share/games/freespace2-open/data/movies
+    install_to: $assets/freespace2-open/data/movies
     install:
     - ogg movies
 
diff --git a/data/hexen2.yaml b/data/hexen2.yaml
index 23fa0ee..02b4248 100644
--- a/data/hexen2.yaml
+++ b/data/hexen2.yaml
@@ -23,7 +23,7 @@ packages:
   hexen2-demo-data:
     demo_for: hexen2-data
     mutually_exclusive: True
-    install_to: usr/share/games/hexen2
+    install_to: $assets/hexen2
     install:
     - data1/pak0.pak_demo
     license:
@@ -41,14 +41,14 @@ packages:
   hexen2-portals-data:
     longname: "Hexen II Mission Pack: Portal of Praevus"
     expansion_for: hexen2-data
-    install_to: usr/share/games/hexen2
+    install_to: $assets/hexen2
     install:
     - portals/pak3.pak
 
   hexen2-hexenworld-data:
     longname: "Hexen II: HexenWorld"
     expansion_for: hexen2-data
-    install_to: usr/share/games/hexen2
+    install_to: $assets/hexen2
     install:
     - hw/pak4.pak
 
diff --git a/data/ja.yaml b/data/ja.yaml
index 1ea8cec..56a36f3 100644
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@ -45,7 +45,7 @@ packages:
     DISABLED: https://github.com/JACoders/OpenJK/issues/618
     engine: openjk-academy
     demo_for: jedi-academy-data
-    install_to: usr/share/games/jedi-academy-demo/base
+    install_to: $assets/jedi-academy-demo/base
     install:
       - demo data
     license:
@@ -75,7 +75,7 @@ packages:
        * "Destroyer" vehicle combat map for Siege mode
       .
     expansion_for: jedi-academy-data
-    install_to: usr/share/games/jedi-academy
+    install_to: $assets/jedi-academy
     symlinks:
       usr/lib/openjk/JediAcademy/base/bonus.pk3: $install_to/base/bonus.pk3
       usr/lib/openjk/JediAcademy/base/siege_destroyer.pk3: $install_to/base/siege_destroyer.pk3
diff --git a/data/lgeneral.yaml b/data/lgeneral.yaml
index 0ba997d..5892e0d 100644
--- a/data/lgeneral.yaml
+++ b/data/lgeneral.yaml
@@ -11,7 +11,7 @@ help_text: |
 packages:
   lgeneral-data-nonfree:
     longname: Panzer General data for LGeneral
-    install_to: usr/share/games/lgeneral
+    install_to: $assets/lgeneral
     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 4398b43..3f1aace 100644
--- a/data/quake.yaml
+++ b/data/quake.yaml
@@ -39,7 +39,7 @@ packages:
     license:
     - licinfo.txt?shareware
     - slicnse.txt
-    install_to: usr/share/games/quake
+    install_to: $assets/quake
 
   quake-registered:
     provides: quake-data
@@ -60,7 +60,7 @@ packages:
     - licinfo.txt?101_cd
     - licinfo.txt?gog
     - rlicnse.txt?101_cd
-    install_to: usr/share/games/quake
+    install_to: $assets/quake
 
   quake-armagon:
     aliases: [armagon, hipnotic, mp1, "1"]
@@ -78,7 +78,7 @@ packages:
     - armagon/manual.txt
     license:
     - license.txt?mp12_cd
-    install_to: usr/share/games/quake
+    install_to: $assets/quake
 
   quake-dissolution:
     aliases: [dissolution, eternity, rogue, mp2, "2"]
@@ -98,7 +98,7 @@ packages:
     - eternity/manual.txt
     license:
     - license.txt?mp12_cd
-    install_to: usr/share/games/quake
+    install_to: $assets/quake
 
   quake-dopa:
     aliases: [ep5]
@@ -107,7 +107,7 @@ packages:
     longname: "Quake Episode 5: Dimensions of the Past"
     wiki: "Episode_5:_Dimensions_of_the_Past"
     copyright: © 2016 MachineGames
-    install_to: usr/share/games/quake/dopa
+    install_to: $assets/quake/dopa
     install:
     - pak0.pak?dopa
     - AUTOEXEC.CFG?dopa
@@ -121,7 +121,7 @@ packages:
     copyright: © 1996 id Software
     aliases: [music]
     expansion_for: quake-registered
-    install_to: usr/share/games/quake
+    install_to: $assets/quake
     copyright_notice: |
       This package contains the Quake soundtrack by Trent Reznor,
       copied from the CD-ROM and encoded in Ogg Vorbis.
@@ -143,7 +143,7 @@ packages:
     copyright: © 1997 Hipnotic Interactive
     aliases: [mp1-music]
     expansion_for: quake-armagon
-    install_to: usr/share/games/quake
+    install_to: $assets/quake
     copyright_notice: |
       This package contains the Quake - Scourge of Armagon (Mission Pack 1)
       soundtrack by Jeehun Hwang and Rob Patterson, copied from the CD-ROM and
@@ -169,7 +169,7 @@ packages:
     copyright: © 1997 Hipnotic Interactive
     aliases: [mp2-music]
     expansion_for: quake-dissolution
-    install_to: usr/share/games/quake
+    install_to: $assets/quake
     copyright_notice: |
       This package contains the Quake - Dissolution of Eternity (Mission Pack 2)
       soundtrack by Jeehun Hwang and Rob Patterson, copied from the CD-ROM and
diff --git a/data/quake2.yaml b/data/quake2.yaml
index 2050de8..1f3fa56 100644
--- a/data/quake2.yaml
+++ b/data/quake2.yaml
@@ -40,7 +40,7 @@ packages:
       path: "common/Quake 2"
     gog:
       url: quake_ii_quad_damage
-    install_to: usr/share/games/quake2
+    install_to: $assets/quake2
     install:
     - baseq2/pak0.pak
     - patch data
@@ -83,7 +83,7 @@ packages:
     aliases: [music]
     expansion_for: quake2-full-data
     # http://musicbrainz.org/release/06727a29-435d-423e-90a8-1a4fed5edb54
-    install_to: usr/share/games/quake2
+    install_to: $assets/quake2
     copyright_notice: |
       This package contains the Quake II soundtrack by Sonic Mayhem, Jer Sypult
       and Bill Brown, copied from the CD-ROM and encoded in Ogg Vorbis.
@@ -114,7 +114,7 @@ packages:
       To play Quake II using this data, install the quake2 package and pass
       "+set game xatrix" as arguments.
     symlinks:
-      usr/share/games/quake2/quake2-reckoning: usr/games/quake2
+      $assets/quake2/quake2-reckoning: usr/games/quake2
     longname: "Quake II Mission Pack 1: The Reckoning"
     wiki: "Quake_II_Mission_Pack:_The_Reckoning"
     steam:
@@ -129,7 +129,7 @@ packages:
     replaces: quake2-xatrix
     expansion_for: quake2-full-data
     architecture: any
-    install_to: usr/share/games/quake2
+    install_to: $assets/quake2
     version: "2.04"
     install:
     - quake2-xatrix-2.04.tar.xz
@@ -148,7 +148,7 @@ packages:
     copyright: © 1998 Xatrix Entertainment
     expansion_for: quake2-reckoning-data
     # http://musicbrainz.org/release/a1eb0af4-6348-4aa6-a586-4f41a33c5dea
-    install_to: usr/share/games/quake2
+    install_to: $assets/quake2
     copyright_notice: |
       This package contains the Quake II soundtrack by Sonic Mayhem, Jer Sypult
       and Bill Brown, copied from the CD-ROM and encoded in Ogg Vorbis.
@@ -160,7 +160,7 @@ packages:
   quake2-groundzero-data:
     data_type: data and binaries
     symlinks:
-      usr/share/games/quake2/quake2-groundzero: usr/games/quake2
+      $assets/quake2/quake2-groundzero: usr/games/quake2
     aliases: [rogue, q2rogue, groundzero, mp2, "2"]
     longname: "Quake II Mission Pack 2: Ground Zero"
     wiki: "Quake_II_Mission_Pack:_Ground_Zero"
@@ -185,7 +185,7 @@ packages:
     replaces: quake2-rogue
     expansion_for: quake2-full-data
     architecture: any
-    install_to: usr/share/games/quake2
+    install_to: $assets/quake2
     version: "2.03"
     install:
     - quake2-rogue-2.03.tar.xz
@@ -204,7 +204,7 @@ packages:
     copyright: © 1998 Rogue Entertainment
     aliases: [mp2music]
     # http://musicbrainz.org/release/7590e38c-f203-425a-b726-37a55b6d2937
-    install_to: usr/share/games/quake2
+    install_to: $assets/quake2
     copyright_notice: |
       This package contains the Quake II soundtrack by Sonic Mayhem, Jer Sypult
       and Bill Brown, copied from the CD-ROM and encoded in Ogg Vorbis.
diff --git a/data/quake3.yaml b/data/quake3.yaml
index 7a4610d..12859bf 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -53,15 +53,15 @@ packages:
     # is installed unless its pak0.pk3 is present.
     symlinks:
       # src:quake < 10
-      usr/share/games/quake3/baseq3/pak0.pk3: $install_to/baseq3/pak0.pk3
-      usr/share/games/quake3/baseq3/pak1.pk3: $install_to/baseq3/pak1.pk3
-      usr/share/games/quake3/baseq3/pak2.pk3: $install_to/baseq3/pak2.pk3
-      usr/share/games/quake3/baseq3/pak3.pk3: $install_to/baseq3/pak3.pk3
-      usr/share/games/quake3/baseq3/pak4.pk3: $install_to/baseq3/pak4.pk3
-      usr/share/games/quake3/baseq3/pak5.pk3: $install_to/baseq3/pak5.pk3
-      usr/share/games/quake3/baseq3/pak6.pk3: $install_to/baseq3/pak6.pk3
-      usr/share/games/quake3/baseq3/pak7.pk3: $install_to/baseq3/pak7.pk3
-      usr/share/games/quake3/baseq3/pak8.pk3: $install_to/baseq3/pak8.pk3
+      $assets/quake3/baseq3/pak0.pk3: $install_to/baseq3/pak0.pk3
+      $assets/quake3/baseq3/pak1.pk3: $install_to/baseq3/pak1.pk3
+      $assets/quake3/baseq3/pak2.pk3: $install_to/baseq3/pak2.pk3
+      $assets/quake3/baseq3/pak3.pk3: $install_to/baseq3/pak3.pk3
+      $assets/quake3/baseq3/pak4.pk3: $install_to/baseq3/pak4.pk3
+      $assets/quake3/baseq3/pak5.pk3: $install_to/baseq3/pak5.pk3
+      $assets/quake3/baseq3/pak6.pk3: $install_to/baseq3/pak6.pk3
+      $assets/quake3/baseq3/pak7.pk3: $install_to/baseq3/pak7.pk3
+      $assets/quake3/baseq3/pak8.pk3: $install_to/baseq3/pak8.pk3
       # src:quake >= 10
       usr/lib/quake3/base/baseq3/pak0.pk3: $install_to/baseq3/pak0.pk3
       usr/lib/quake3/base/baseq3/pak1.pk3: $install_to/baseq3/pak1.pk3
@@ -89,7 +89,7 @@ packages:
       $pkgdocdir/Help/Dedicated Server.htm: $pkgdocdir/Help/DedicatedServer.html
       $pkgdocdir/Help/Index.htm: $pkgdocdir/Help/Index.html
       $pkgdocdir/Help/Readme.htm: $pkgdocdir/Help/Readme.html
-    install_to: usr/share/games/quake3-data
+    install_to: $assets/quake3-data
     install:
       - baseq3/pak0.pk3
       - patch pk3s
@@ -144,22 +144,22 @@ packages:
     install:
     - missionpack/pak0.pk3
     symlinks:
-      usr/share/games/quake3-team-arena-data/quake3-team-arena: usr/games/quake3
+      $assets/quake3-team-arena-data/quake3-team-arena: usr/games/quake3
       # quake < 10
-      usr/share/games/quake3/missionpack/pak0.pk3: $install_to/missionpack/pak0.pk3
-      usr/share/games/quake3/missionpack/pak1.pk3: $install_to/missionpack/pak1.pk3
-      usr/share/games/quake3/missionpack/pak2.pk3: $install_to/missionpack/pak2.pk3
-      usr/share/games/quake3/missionpack/pak3.pk3: $install_to/missionpack/pak3.pk3
+      $assets/quake3/missionpack/pak0.pk3: $install_to/missionpack/pak0.pk3
+      $assets/quake3/missionpack/pak1.pk3: $install_to/missionpack/pak1.pk3
+      $assets/quake3/missionpack/pak2.pk3: $install_to/missionpack/pak2.pk3
+      $assets/quake3/missionpack/pak3.pk3: $install_to/missionpack/pak3.pk3
       # quake >= 10
       usr/lib/quake3/ta/missionpack/pak0.pk3: $install_to/missionpack/pak0.pk3
-    install_to: usr/share/games/quake3-team-arena-data
+    install_to: $assets/quake3-team-arena-data
 
   quake3-demo-data:
     # deliberately no quake3-server alternative, I'm pretty sure it isn't
     # network-compatible with anything
     engine: quake3 (>= 10)
     demo_for: quake3-data
-    install_to: usr/share/games/quake3-demo-data/demoq3
+    install_to: $assets/quake3-demo-data/demoq3
     install:
     - demoq3/pak0.pk3
     - demo files from patches
@@ -270,7 +270,7 @@ files:
     distinctive_size: true
 
   demoq3/pak0.pk3:
-    install_to: usr/share/games/quake3-demo-data
+    install_to: $assets/quake3-demo-data
 
   linuxq3apoint-1.32b-3.x86.run:
     size: 30923961
diff --git a/data/quake4.yaml b/data/quake4.yaml
index 7d52af6..c81073a 100644
--- a/data/quake4.yaml
+++ b/data/quake4.yaml
@@ -48,13 +48,13 @@ packages:
     install:
       - patch 1.4.2 binaries
     symlinks:
-      usr/lib/quake4/q4base: usr/share/games/quake4/q4base
-      usr/lib/quake4/q4mp: usr/share/games/quake4/q4mp
+      usr/lib/quake4/q4base: $assets/quake4/q4base
+      usr/lib/quake4/q4mp: $assets/quake4/q4mp
       # The bundled implementation isn't great, and xdg-open is
       # binary-compatible
       usr/lib/quake4/openurl.sh: usr/bin/xdg-open
-      usr/lib/quake4/version.info: usr/share/games/quake4/version.info
-      usr/lib/quake4/q4icon.bmp: usr/share/games/quake4/q4icon.bmp
+      usr/lib/quake4/version.info: $assets/quake4/version.info
+      usr/lib/quake4/q4icon.bmp: $assets/quake4/q4icon.bmp
 
     license:
       - EULA.txt?steam
@@ -93,7 +93,7 @@ packages:
     version: "1.4.2"
     provides: quake4-any-data
     replaces: quake4-any-data
-    install_to: usr/share/games/quake4
+    install_to: $assets/quake4
     # this is not actually dubbed, just censored
     langs:
       - en
diff --git a/data/rtcw.yaml b/data/rtcw.yaml
index c8cebe6..6daf478 100644
--- a/data/rtcw.yaml
+++ b/data/rtcw.yaml
@@ -36,7 +36,7 @@ packages:
       game: return_to_castle_wolfenstein_game
     # GDP version will be suffixed to this, e.g. : 1.42b+39
     version: 1.42b
-    install_to: usr/share/games/rtcw
+    install_to: $assets/rtcw
     install:
     - main/autoexec.cfg
     - main/mp_pak0.pk3
@@ -72,7 +72,7 @@ packages:
     symlinks:
       usr/lib/rtcw/main/sp_pakG.pk3:
         $install_to/main/sp_pakG.pk3
-    install_to: usr/share/games/rtcw
+    install_to: $assets/rtcw
     install:
     - main/autoexec.cfg
     - main/mp_pak0.pk3
@@ -104,7 +104,7 @@ packages:
     mutually_exclusive: True
     better_version: rtcw-de-data
     version: 1.42b
-    install_to: usr/share/games/rtcw
+    install_to: $assets/rtcw
     install:
     - main/autoexec.cfg
     - main/mp_pak0.pk3
@@ -134,7 +134,7 @@ packages:
     provides: rtcw-data
     mutually_exclusive: True
     version: 1.42b
-    install_to: usr/share/games/rtcw
+    install_to: $assets/rtcw
     install:
     - main/mp_pak0.pk3
     - main/mp_pak1.pk3
@@ -162,7 +162,7 @@ packages:
     provides: rtcw-data
     mutually_exclusive: True
     version: 1.42b
-    install_to: usr/share/games/rtcw
+    install_to: $assets/rtcw
     install:
     - main/mp_pak0.pk3
     - main/mp_pak1.pk3
@@ -192,7 +192,7 @@ packages:
     provides: rtcw-data
     mutually_exclusive: True
     version: 1.42b
-    install_to: usr/share/games/rtcw
+    install_to: $assets/rtcw
     install:
     - main/mp_pak0.pk3
     - main/mp_pak1.pk3
diff --git a/data/spear-of-destiny.yaml b/data/spear-of-destiny.yaml
index 7505bf5..2794399 100644
--- a/data/spear-of-destiny.yaml
+++ b/data/spear-of-destiny.yaml
@@ -42,7 +42,7 @@ packages:
       out of 21 in total.
     demo_for: spear-of-destiny-data
     component: non-free
-    install_to: usr/share/games/wolf3d
+    install_to: $assets/wolf3d
     install:
     - audiohed.sdm
     - audiot.sdm
@@ -66,7 +66,7 @@ packages:
     engine:
       fedora: wolf4sdl-spear
     install_to:
-      deb: usr/share/games/wolf3d
+      deb: $assets/wolf3d
       fedora: usr/share/spear/full
     install:
     - audiohed.sod
@@ -83,7 +83,7 @@ packages:
 
       Each mission consists of 21 levels.
     install_to:
-      deb: usr/share/games/wolf3d
+      deb: $assets/wolf3d
       fedora: usr/share/spear/full
     provides: spear-of-destiny-mission-pack
     install:
@@ -101,7 +101,7 @@ packages:
     description: "Each mission pack provides 21 levels."
     wiki: Return_to_Danger
     install_to:
-      deb: usr/share/games/wolf3d
+      deb: $assets/wolf3d
       fedora: usr/share/spear/full
     provides: spear-of-destiny-mission-pack
     install:
@@ -115,7 +115,7 @@ packages:
     description: "Each mission pack provides 21 levels."
     wiki: Ultimate_Challenge
     install_to:
-      deb: usr/share/games/wolf3d
+      deb: $assets/wolf3d
       fedora: usr/share/spear/full
     provides: spear-of-destiny-mission-pack
     install:
diff --git a/data/syndicate.yaml b/data/syndicate.yaml
index 01e7076..ca53f84 100644
--- a/data/syndicate.yaml
+++ b/data/syndicate.yaml
@@ -8,9 +8,9 @@ genre: Tactical
 
 packages:
   syndicate-data:
-    install_to: usr/share/games/freesynd/data
+    install_to: $assets/freesynd/data
     # this should be engine-agnostic:
-    #  usr/share/games/syndicate
+    #  $assets/syndicate
     origin:
       path: "Syndicate (1993)"
     url_misc: https://www.origin.com/en-be/store/buy/syndicate-plus-origin/pc-download/base-game/standard-edition
diff --git a/data/theme-hospital.yaml b/data/theme-hospital.yaml
index 2ee3e58..145bc23 100644
--- a/data/theme-hospital.yaml
+++ b/data/theme-hospital.yaml
@@ -46,7 +46,7 @@ packages:
     - levels/full00.sam
 
   theme-hospital-demo-data:
-    install_to: usr/share/games/theme-hospital
+    install_to: $assets/theme-hospital
     demo_for: theme-hospital-data
     mutually_exclusive: True
     conflicts: theme-hospital-full-data
diff --git a/data/ttd.yaml b/data/ttd.yaml
index 7308f77..b187390 100644
--- a/data/ttd.yaml
+++ b/data/ttd.yaml
@@ -6,14 +6,14 @@ genre: Simulation
 
 packages:
   transport-tycoon-deluxe-data:
-    install_to: usr/share/games/openttd/baseset
+    install_to: $assets/openttd/baseset
     install:
     - assets
 
   transport-tycoon-deluxe-music:
     longname: Transport Tycoon Deluxe (music)
     expansion_for: transport-tycoon-deluxe-data
-    install_to: usr/share/games/openttd/baseset
+    install_to: $assets/openttd/baseset
     install:
     - musics
 
diff --git a/data/unreal.yaml b/data/unreal.yaml
index d08fb23..8a8d476 100644
--- a/data/unreal.yaml
+++ b/data/unreal.yaml
@@ -257,10 +257,12 @@ packages:
       - Unreal 227i Gold binaries
       - Help/lin_convenience_libs.tar.bz2
     symlinks:
+      # FIXME: ideally $gbpdatadir/gdp-launcher or something, but that
+      # would require gdp to be aware of where it was going to be installed
       $bindir/unreal-gold:
-        usr/share/games/game-data-packager/gdp-launcher
+        $assets/game-data-packager/gdp-launcher
       usr/share/applications/unreal-gold.desktop:
-        usr/share/games/game-data-packager/unreal-gold.desktop
+        $assets/game-data-packager/unreal-gold.desktop
 
   unreal-libfmod:
     version: 3.75+227i
@@ -333,9 +335,9 @@ packages:
     doc:
       - Unreal classic documentation
     symlinks:
-      $bindir/unreal: usr/share/games/game-data-packager/gdp-launcher
+      $bindir/unreal: $assets/game-data-packager/gdp-launcher
       usr/share/applications/unreal.desktop:
-        usr/share/games/game-data-packager/unreal.desktop
+        $assets/game-data-packager/unreal.desktop
 
 files:
   setup_unreal_gold_2.0.0.6.exe:
diff --git a/data/wip/warcraft2.yaml b/data/wip/warcraft2.yaml
index b94bfb7..e093242 100644
--- a/data/wip/warcraft2.yaml
+++ b/data/wip/warcraft2.yaml
@@ -13,7 +13,7 @@ packages:
   warcraft2-en-data:
     provides: warcraft2-data
     mutually_exclusive: True
-    install_to: usr/share/games/stratagus/wargus
+    install_to: $assets/stratagus/wargus
     install:
     - shared assets
     - english version
@@ -23,7 +23,7 @@ packages:
     provides: warcraft2-data
     mutually_exclusive: True
     lang: fr
-    install_to: usr/share/games/stratagus/wargus
+    install_to: $assets/stratagus/wargus
     install:
     - shared assets
     - french version
@@ -35,13 +35,13 @@ packages:
   # dirrectly with Fluidsynth
   warcraft2-music:
     expansion_for: warcraft2-data
-    install_to: usr/share/games/stratagus/wargus/music
+    install_to: $assets/stratagus/wargus/music
     install:
     - musics
 
   warcraft2-video:
     expansion_for: warcraft2-data
-    install_to: usr/share/games/stratagus/wargus/videos
+    install_to: $assets/stratagus/wargus/videos
     install:
     - videos
 
diff --git a/data/wolf3d.yaml b/data/wolf3d.yaml
index c25c460..e22089c 100644
--- a/data/wolf3d.yaml
+++ b/data/wolf3d.yaml
@@ -19,7 +19,7 @@ packages:
     - wolf3d-v14-alt-data
     - wolf3d-v14-apogee-data
     replaces: wolf3d-data-wl1
-    install_to: usr/share/games/wolf3d
+    install_to: $assets/wolf3d
     install:
     - audiohed.wl1
     - audiot.wl1
@@ -50,7 +50,7 @@ packages:
        * Episode 6: Confrontation
     provides: wolf3d-data
     mutually_exclusive: True
-    install_to: usr/share/games/wolf3d
+    install_to: $assets/wolf3d
     install:
     - audiohed.wl6?1.0
     - audiot.wl6?1.0
@@ -79,7 +79,7 @@ packages:
       fedora: wolf4sdl-registered-id
     install_to:
       fedora: usr/share/wolf3d/registered-id
-      generic: usr/share/games/wolf3d
+      generic: $assets/wolf3d
     steam:
       id: 2270
       path: common/Wolfenstein 3D
@@ -116,7 +116,7 @@ packages:
         wolf4sdl-registered-id
     install_to:
       fedora: usr/share/wolf3d/registered-id
-      generic: usr/share/games/wolf3d
+      generic: $assets/wolf3d
     install:
     - audiohed.wl6
     - audiot.wl6
@@ -145,7 +145,7 @@ packages:
       fedora: wolf4sdl-registered-apogee
     install_to:
       fedora: usr/share/wolf3d/registered-apogee
-      generic: usr/share/games/wolf3d
+      generic: $assets/wolf3d
     install:
     - audiohed.wl6
     - audiot.wl6

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