[game-data-packager] 07/25: Mostly replace hard-coded /usr/lib with $prefix/lib
Simon McVittie
smcv at debian.org
Sun Oct 9 21:26:05 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 603a81e55b0f5c9334b6c804e7dba0f6140af026
Author: Simon McVittie <smcv at debian.org>
Date: Sun Oct 9 12:32:41 2016 +0100
Mostly replace hard-coded /usr/lib with $prefix/lib
For Flatpak, we'll want to use /app/lib.
---
data/etqw.yaml | 8 +++---
data/ja.yaml | 4 +--
data/quake3.yaml | 54 +++++++++++++++++++-------------------
data/quake4.yaml | 14 +++++-----
data/rtcw.yaml | 2 +-
data/unreal.yaml | 10 +++----
runtime/launch-unreal-gold.yaml.in | 14 +++++-----
runtime/launch-unreal.yaml.in | 16 +++++------
8 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/data/etqw.yaml b/data/etqw.yaml
index 0b1fa44..b1b9886 100644
--- a/data/etqw.yaml
+++ b/data/etqw.yaml
@@ -15,7 +15,7 @@ try_repack_from:
packages:
etqw-pb-bin:
short_description: ETQW PunkBuster binaries
- install_to: usr/lib/etqw
+ install_to: $prefix/lib/etqw
architecture: i386
version: "1.5"
depends:
@@ -30,7 +30,7 @@ packages:
etqw-bin:
data_type: binaries
- install_to: usr/lib/etqw
+ install_to: $prefix/lib/etqw
architecture: i386
version: "1.5"
depends:
@@ -50,10 +50,10 @@ packages:
license:
- patch 1.4 to 1.5 - licenses
symlinks:
- usr/lib/etqw/base: $assets/etqw/base
+ $prefix/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
+ $prefix/lib/etqw/openurl.sh: /usr/bin/xdg-open
etqw-data:
version: "1.5"
diff --git a/data/ja.yaml b/data/ja.yaml
index 56a36f3..9967546 100644
--- a/data/ja.yaml
+++ b/data/ja.yaml
@@ -77,8 +77,8 @@ packages:
expansion_for: jedi-academy-data
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
+ $prefix/lib/openjk/JediAcademy/base/bonus.pk3: $install_to/base/bonus.pk3
+ $prefix/lib/openjk/JediAcademy/base/siege_destroyer.pk3: $install_to/base/siege_destroyer.pk3
install:
- bonus maps
diff --git a/data/quake3.yaml b/data/quake3.yaml
index 12859bf..a8a92ee 100644
--- a/data/quake3.yaml
+++ b/data/quake3.yaml
@@ -63,27 +63,27 @@ packages:
$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
- usr/lib/quake3/base/baseq3/pak2.pk3: $install_to/baseq3/pak2.pk3
- usr/lib/quake3/base/baseq3/pak3.pk3: $install_to/baseq3/pak3.pk3
- usr/lib/quake3/base/baseq3/pak4.pk3: $install_to/baseq3/pak4.pk3
- usr/lib/quake3/base/baseq3/pak5.pk3: $install_to/baseq3/pak5.pk3
- usr/lib/quake3/base/baseq3/pak6.pk3: $install_to/baseq3/pak6.pk3
- usr/lib/quake3/base/baseq3/pak7.pk3: $install_to/baseq3/pak7.pk3
- usr/lib/quake3/base/baseq3/pak8.pk3: $install_to/baseq3/pak8.pk3
- usr/lib/quake3/ta/baseq3/pak0.pk3: $install_to/baseq3/pak0.pk3
- usr/lib/quake3/ta/baseq3/pak1.pk3: $install_to/baseq3/pak1.pk3
- usr/lib/quake3/ta/baseq3/pak2.pk3: $install_to/baseq3/pak2.pk3
- usr/lib/quake3/ta/baseq3/pak3.pk3: $install_to/baseq3/pak3.pk3
- usr/lib/quake3/ta/baseq3/pak4.pk3: $install_to/baseq3/pak4.pk3
- usr/lib/quake3/ta/baseq3/pak5.pk3: $install_to/baseq3/pak5.pk3
- usr/lib/quake3/ta/baseq3/pak6.pk3: $install_to/baseq3/pak6.pk3
- usr/lib/quake3/ta/baseq3/pak7.pk3: $install_to/baseq3/pak7.pk3
- usr/lib/quake3/ta/baseq3/pak8.pk3: $install_to/baseq3/pak8.pk3
- usr/lib/quake3/ta/missionpack/pak1.pk3: $install_to/missionpack/pak1.pk3
- usr/lib/quake3/ta/missionpack/pak2.pk3: $install_to/missionpack/pak2.pk3
- usr/lib/quake3/ta/missionpack/pak3.pk3: $install_to/missionpack/pak3.pk3
+ $prefix/lib/quake3/base/baseq3/pak0.pk3: $install_to/baseq3/pak0.pk3
+ $prefix/lib/quake3/base/baseq3/pak1.pk3: $install_to/baseq3/pak1.pk3
+ $prefix/lib/quake3/base/baseq3/pak2.pk3: $install_to/baseq3/pak2.pk3
+ $prefix/lib/quake3/base/baseq3/pak3.pk3: $install_to/baseq3/pak3.pk3
+ $prefix/lib/quake3/base/baseq3/pak4.pk3: $install_to/baseq3/pak4.pk3
+ $prefix/lib/quake3/base/baseq3/pak5.pk3: $install_to/baseq3/pak5.pk3
+ $prefix/lib/quake3/base/baseq3/pak6.pk3: $install_to/baseq3/pak6.pk3
+ $prefix/lib/quake3/base/baseq3/pak7.pk3: $install_to/baseq3/pak7.pk3
+ $prefix/lib/quake3/base/baseq3/pak8.pk3: $install_to/baseq3/pak8.pk3
+ $prefix/lib/quake3/ta/baseq3/pak0.pk3: $install_to/baseq3/pak0.pk3
+ $prefix/lib/quake3/ta/baseq3/pak1.pk3: $install_to/baseq3/pak1.pk3
+ $prefix/lib/quake3/ta/baseq3/pak2.pk3: $install_to/baseq3/pak2.pk3
+ $prefix/lib/quake3/ta/baseq3/pak3.pk3: $install_to/baseq3/pak3.pk3
+ $prefix/lib/quake3/ta/baseq3/pak4.pk3: $install_to/baseq3/pak4.pk3
+ $prefix/lib/quake3/ta/baseq3/pak5.pk3: $install_to/baseq3/pak5.pk3
+ $prefix/lib/quake3/ta/baseq3/pak6.pk3: $install_to/baseq3/pak6.pk3
+ $prefix/lib/quake3/ta/baseq3/pak7.pk3: $install_to/baseq3/pak7.pk3
+ $prefix/lib/quake3/ta/baseq3/pak8.pk3: $install_to/baseq3/pak8.pk3
+ $prefix/lib/quake3/ta/missionpack/pak1.pk3: $install_to/missionpack/pak1.pk3
+ $prefix/lib/quake3/ta/missionpack/pak2.pk3: $install_to/missionpack/pak2.pk3
+ $prefix/lib/quake3/ta/missionpack/pak3.pk3: $install_to/missionpack/pak3.pk3
# let mix win & linux html documentation
$pkgdocdir/Help/BotCommands.htm: $pkgdocdir/Help/BotCommands.html
$pkgdocdir/Help/Dedicated Server.htm: $pkgdocdir/Help/DedicatedServer.html
@@ -151,7 +151,7 @@ packages:
$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
+ $prefix/lib/quake3/ta/missionpack/pak0.pk3: $install_to/missionpack/pak0.pk3
install_to: $assets/quake3-team-arena-data
quake3-demo-data:
@@ -164,11 +164,11 @@ packages:
- demoq3/pak0.pk3
- demo files from patches
symlinks:
- usr/lib/quake3/demo/demoq3/pak0.pk3: $install_to/pak0.pk3
- usr/lib/quake3/demo/demoq3/botfiles: $install_to/botfiles
- usr/lib/quake3/demo/demoq3/gfx: $install_to/gfx
- usr/lib/quake3/demo/demoq3/scripts: $install_to/scripts
- usr/lib/quake3/demo/demoq3/vm: $install_to/vm
+ $prefix/lib/quake3/demo/demoq3/pak0.pk3: $install_to/pak0.pk3
+ $prefix/lib/quake3/demo/demoq3/botfiles: $install_to/botfiles
+ $prefix/lib/quake3/demo/demoq3/gfx: $install_to/gfx
+ $prefix/lib/quake3/demo/demoq3/scripts: $install_to/scripts
+ $prefix/lib/quake3/demo/demoq3/vm: $install_to/vm
license:
- Help/Q3A_EULA.html
- Help/Q3A_EULA.txt
diff --git a/data/quake4.yaml b/data/quake4.yaml
index c81073a..bd8a941 100644
--- a/data/quake4.yaml
+++ b/data/quake4.yaml
@@ -16,7 +16,7 @@ packages:
quake4-pb-bin:
DISABLED: mitigation for CVE-2007-5248 <http://aluigi.altervista.org/adv/d3engfspb-adv.txt>
short_description: Quake 4 PunkBuster binaries
- install_to: usr/lib/quake4
+ install_to: $prefix/lib/quake4
architecture: i386
version: "1.4.2"
depends:
@@ -32,7 +32,7 @@ packages:
quake4-bin:
data_type: binaries
- install_to: usr/lib/quake4
+ install_to: $prefix/lib/quake4
architecture: i386
version: "1.4.2"
depends:
@@ -48,13 +48,13 @@ packages:
install:
- patch 1.4.2 binaries
symlinks:
- usr/lib/quake4/q4base: $assets/quake4/q4base
- usr/lib/quake4/q4mp: $assets/quake4/q4mp
+ $prefix/lib/quake4/q4base: $assets/quake4/q4base
+ $prefix/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: $assets/quake4/version.info
- usr/lib/quake4/q4icon.bmp: $assets/quake4/q4icon.bmp
+ $prefix/lib/quake4/openurl.sh: /usr/bin/xdg-open
+ $prefix/lib/quake4/version.info: $assets/quake4/version.info
+ $prefix/lib/quake4/q4icon.bmp: $assets/quake4/q4icon.bmp
license:
- EULA.txt?steam
diff --git a/data/rtcw.yaml b/data/rtcw.yaml
index 6daf478..1e8422d 100644
--- a/data/rtcw.yaml
+++ b/data/rtcw.yaml
@@ -70,7 +70,7 @@ packages:
game: return_to_castle_wolfenstein_game
version: 1.42b
symlinks:
- usr/lib/rtcw/main/sp_pakG.pk3:
+ $prefix/lib/rtcw/main/sp_pakG.pk3:
$install_to/main/sp_pakG.pk3
install_to: $assets/rtcw
install:
diff --git a/data/unreal.yaml b/data/unreal.yaml
index 8a8d476..7f4985b 100644
--- a/data/unreal.yaml
+++ b/data/unreal.yaml
@@ -235,7 +235,7 @@ packages:
game: unreal_gold
url: unreal_gold
architecture: i386
- install_to: usr/lib/unreal-gold
+ install_to: $prefix/lib/unreal-gold
depends:
- unreal-data
- unreal-gold-data
@@ -261,13 +261,13 @@ packages:
# would require gdp to be aware of where it was going to be installed
$bindir/unreal-gold:
$assets/game-data-packager/gdp-launcher
- usr/share/applications/unreal-gold.desktop:
+ $prefix/share/applications/unreal-gold.desktop:
$assets/game-data-packager/unreal-gold.desktop
unreal-libfmod:
version: 3.75+227i
architecture: i386
- install_to: usr/lib/unreal
+ install_to: $prefix/lib/unreal
short_description: proprietary audio middleware for the Unreal game engine
description: |
libfmod is a proprietary cross-platform audio middleware library.
@@ -285,7 +285,7 @@ packages:
# non-distributable because LGPL source code isn't included
# probably version 3.1.something but we don't know for sure
version: 0+227i
- install_to: usr/lib/unreal
+ install_to: $prefix/lib/unreal
short_description: legacy version of libmikmod for the Unreal game engine
description: |
Mikmod is a playback library for module files (sample-based audio).
@@ -305,7 +305,7 @@ packages:
version: 227i
longname: Unreal Classic
data_type: binaries
- install_to: usr/lib/unreal-classic
+ install_to: $prefix/lib/unreal-classic
architecture: i386
depends:
- unreal-data
diff --git a/runtime/launch-unreal-gold.yaml.in b/runtime/launch-unreal-gold.yaml.in
index ea967a2..4ce295c 100644
--- a/runtime/launch-unreal-gold.yaml.in
+++ b/runtime/launch-unreal-gold.yaml.in
@@ -6,8 +6,8 @@ required_files:
- System/UnrealLinux.bin
- Maps/Entry.unr
base_directories:
- - /usr/lib/unreal-gold
- - /usr/lib/unreal
+ - $prefix/lib/unreal-gold
+ - $prefix/lib/unreal
- $assets/unreal-gold
- $assets/unreal
- $assets/unreal-ut99-shared
@@ -28,23 +28,23 @@ edit_unreal_ini:
always:
- section: Core.System
append_unique:
- - Paths=/usr/lib/unreal-gold/Maps/*.unr
- - Paths=/usr/lib/unreal-gold/Maps/UPak/*.unr
+ - Paths=$prefix/lib/unreal-gold/Maps/*.unr
+ - Paths=$prefix/lib/unreal-gold/Maps/UPak/*.unr
- Paths=$assets/unreal-gold/Maps/*.unr
- Paths=$assets/unreal-gold/Maps/UPak/*.unr
- Paths=$assets/unreal/Maps/*.unr
- - Paths=/usr/lib/unreal-gold/Textures/*.utx
+ - Paths=$prefix/lib/unreal-gold/Textures/*.utx
- Paths=$assets/unreal-gold/Textures/*.utx
- Paths=$assets/unreal/Textures/*.utx
- Paths=$assets/unreal-ut99-shared/Textures/*.utx
- - Paths=/usr/lib/unreal-gold/Sounds/*.uax
+ - Paths=$prefix/lib/unreal-gold/Sounds/*.uax
- Paths=$assets/unreal-gold/Sounds/*.uax
- Paths=$assets/unreal/Sounds/*.uax
- Paths=$assets/unreal-ut99-shared/Sounds/*.uax
- - Paths=/usr/lib/unreal-gold/Music/*.umx
+ - Paths=$prefix/lib/unreal-gold/Music/*.umx
- Paths=$assets/unreal-gold/Music/*.umx
- Paths=$assets/unreal/Music/*.umx
...
diff --git a/runtime/launch-unreal.yaml.in b/runtime/launch-unreal.yaml.in
index c3e7bf4..74c12a0 100644
--- a/runtime/launch-unreal.yaml.in
+++ b/runtime/launch-unreal.yaml.in
@@ -6,8 +6,8 @@ required_files:
- System/UnrealLinux.bin
- Maps/Entry.unr
base_directories:
- - /usr/lib/unreal-classic
- - /usr/lib/unreal
+ - $prefix/lib/unreal-classic
+ - $prefix/lib/unreal
- $assets/unreal
- $assets/unreal-ut99-shared
working_directory: $${XDG_DATA_HOME}/unreal/System
@@ -27,23 +27,23 @@ edit_unreal_ini:
always:
- section: Core.System
append_unique:
- - Paths=/usr/lib/unreal-classic/System/*.u
+ - Paths=$prefix/lib/unreal-classic/System/*.u
- Paths=$assets/unreal/System/*.u
- - Paths=/usr/lib/unreal-classic/Maps/*.unr
+ - Paths=$prefix/lib/unreal-classic/Maps/*.unr
- Paths=$assets/unreal/Maps/*.unr
- - Paths=/usr/lib/unreal-classic/Textures/*.utx
+ - Paths=$prefix/lib/unreal-classic/Textures/*.utx
- Paths=$assets/unreal/Textures/*.utx
- Paths=$assets/unreal-ut99-shared/Textures/*.utx
- - Paths=/usr/lib/unreal-classic/Sounds/*.uax
+ - Paths=$prefix/lib/unreal-classic/Sounds/*.uax
- Paths=$assets/unreal/Sounds/*.uax
- Paths=$assets/unreal-ut99-shared/Sounds/*.uax
- - Paths=/usr/lib/unreal-classic/Music/*.umx
+ - Paths=$prefix/lib/unreal-classic/Music/*.umx
- Paths=$assets/unreal/Music/*.umx
- - Paths=/usr/lib/unreal-classic/Meshes/*.usm
+ - Paths=$prefix/lib/unreal-classic/Meshes/*.usm
- Paths=$assets/unreal/Meshes/*.usm
...
--
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