[openjk] 07/08: Adapt for new upstream installation layout with JediAcademy, JediOutcast dirs
Simon McVittie
smcv at debian.org
Mon Apr 27 21:28:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository openjk.
commit 6883f847bac5eb17126e4e7e6c29867d7e06c551
Author: Simon McVittie <smcv at debian.org>
Date: Mon Apr 27 20:48:07 2015 +0100
Adapt for new upstream installation layout with JediAcademy, JediOutcast dirs
---
debian/openjk-academy-server.init | 2 +-
debian/openjk-academy-server.install | 4 ++--
debian/openjk-academy-server.links | 4 ++--
debian/openjk-academy.install | 24 ++++++++----------------
debian/openjk-common.install | 14 +++++++-------
debian/openjk-common.links | 8 ++++----
debian/openjk-outcast.install | 25 +++++++++++--------------
debian/openjk-outcast.links | 8 ++++----
debian/rules | 33 +++++++++++++++++----------------
9 files changed, 56 insertions(+), 66 deletions(-)
diff --git a/debian/openjk-academy-server.init b/debian/openjk-academy-server.init
index 65d05c0..2a8fe91 100644
--- a/debian/openjk-academy-server.init
+++ b/debian/openjk-academy-server.init
@@ -15,7 +15,7 @@ NAME="openjk-academy-server"
DAEMON="/usr/games/openjkded"
DESC="Jedi Academy dedicated server"
PIDFILE="/var/run/$NAME.pid"
-BINARY="/usr/lib/openjk-academy/openjkded"
+BINARY="/usr/lib/openjk/JediAcademy/openjkded"
USER="$NAME"
DAEMON_OPTS=""
diff --git a/debian/openjk-academy-server.install b/debian/openjk-academy-server.install
index 0e6dfff..15c3f49 100644
--- a/debian/openjk-academy-server.install
+++ b/debian/openjk-academy-server.install
@@ -1,7 +1,7 @@
# Game plugin is in openjk-common because it's shared by the
# multiplayer client, for listen servers
debian/scripts/openjkded usr/games
-usr/lib/openjk/openjkded usr/lib/openjk-academy
-usr/lib/openjk/openjkded.* usr/lib/openjk-academy
debian/openjk-academy-server at .service lib/systemd/system
debian/server.cfg etc/openjk-academy-server
+usr/lib/openjk/JediAcademy/openjkded
+usr/lib/openjk/JediAcademy/openjkded.*
diff --git a/debian/openjk-academy-server.links b/debian/openjk-academy-server.links
index 0219cc1..9071c45 100644
--- a/debian/openjk-academy-server.links
+++ b/debian/openjk-academy-server.links
@@ -1,3 +1,3 @@
# so you can do "exec etc/openjk-academy-server/server.cfg"
-etc/openjk-academy-server usr/lib/openjk-academy/base/etc/openjk-academy-server
-etc/openjk-academy-server usr/lib/openjk-academy/OpenJK/etc/openjk-academy-server
+etc/openjk-academy-server usr/lib/openjk/JediAcademy/base/etc/openjk-academy-server
+etc/openjk-academy-server usr/lib/openjk/JediAcademy/OpenJK/etc/openjk-academy-server
diff --git a/debian/openjk-academy.install b/debian/openjk-academy.install
index 7521ec7..d9681f2 100644
--- a/debian/openjk-academy.install
+++ b/debian/openjk-academy.install
@@ -1,24 +1,16 @@
# Single-player
debian/scripts/openjk_sp usr/games
-usr/lib/openjk/openjk_sp usr/lib/openjk-academy
-usr/lib/openjk/openjk_sp.* usr/lib/openjk-academy
-usr/lib/openjk/rdsp-*.so usr/lib/openjk-academy
debian/openjk_sp.desktop usr/share/applications
-usr/lib/openjk/OpenJK/jagame*.so
-# Symlinks
-usr/lib/openjk-academy/OpenJK/jagame*.so
-usr/lib/openjk-academy/base/jagame*.so
+usr/lib/openjk/JediAcademy/openjk_sp
+usr/lib/openjk/JediAcademy/openjk_sp.*
+usr/lib/openjk/JediAcademy/rdsp-*.so
+usr/lib/openjk/JediAcademy/OpenJK/jagame*.so
+usr/lib/openjk/JediAcademy/base/jagame*.so
# Multiplayer (game plugin is in openjk-common because it's
# shared by the dedicated server)
debian/scripts/openjk usr/games
-usr/lib/openjk/openjk usr/lib/openjk-academy
-usr/lib/openjk/openjk.* usr/lib/openjk-academy
-usr/lib/openjk/rd-*.so usr/lib/openjk-academy
debian/openjk.desktop usr/share/applications
-
-# Symlinks, used by both SP and MP clients
-usr/lib/openjk-academy/OpenJK/cgame*.so
-usr/lib/openjk-academy/OpenJK/ui*.so
-usr/lib/openjk-academy/base/cgame*.so
-usr/lib/openjk-academy/base/ui*.so
+usr/lib/openjk/JediAcademy/openjk
+usr/lib/openjk/JediAcademy/openjk.*
+usr/lib/openjk/JediAcademy/rd-*.so
diff --git a/debian/openjk-common.install b/debian/openjk-common.install
index 616788d..72fffbd 100644
--- a/debian/openjk-common.install
+++ b/debian/openjk-common.install
@@ -4,13 +4,13 @@ debian/icons/16/openjk.png usr/share/icons/hicolor/16x16/apps
debian/icons/32/openjk.png usr/share/icons/hicolor/32x32/apps
debian/icons/128/openjk.png usr/share/icons/hicolor/128x128/apps
debian/icons/512/openjk.png usr/share/icons/hicolor/512x512/apps
-usr/lib/openjk/OpenJK/cgame*.so
-usr/lib/openjk/OpenJK/ui*.so
+usr/lib/openjk/JediAcademy/OpenJK/cgame*.so
+usr/lib/openjk/JediAcademy/OpenJK/ui*.so
+usr/lib/openjk/JediAcademy/base/cgame*.so
+usr/lib/openjk/JediAcademy/base/ui*.so
# Shared by multiplayer client and server (Jedi Outcast would be here
# too if it supported multiplayer)
-debian/README.jedi-academy-data usr/lib/openjk-academy
-usr/lib/openjk/OpenJK/jampgame*.so
-# Symlinks
-usr/lib/openjk-academy/OpenJK/jampgame*.so
-usr/lib/openjk-academy/base/jampgame*.so
+debian/README.jedi-academy-data usr/lib/openjk/JediAcademy
+usr/lib/openjk/JediAcademy/OpenJK/jampgame*.so
+usr/lib/openjk/JediAcademy/base/jampgame*.so
diff --git a/debian/openjk-common.links b/debian/openjk-common.links
index 0de0962..41ce68f 100644
--- a/debian/openjk-common.links
+++ b/debian/openjk-common.links
@@ -1,6 +1,6 @@
# These will be dangling links if only openjk-outcast is installed, but
# that doesn't really matter.
-usr/share/games/jedi-academy/base/assets0.pk3 usr/lib/openjk-academy/base/assets0.pk3
-usr/share/games/jedi-academy/base/assets1.pk3 usr/lib/openjk-academy/base/assets1.pk3
-usr/share/games/jedi-academy/base/assets2.pk3 usr/lib/openjk-academy/base/assets2.pk3
-usr/share/games/jedi-academy/base/assets3.pk3 usr/lib/openjk-academy/base/assets3.pk3
+usr/share/games/jedi-academy/base/assets0.pk3 usr/lib/openjk/JediAcademy/base/assets0.pk3
+usr/share/games/jedi-academy/base/assets1.pk3 usr/lib/openjk/JediAcademy/base/assets1.pk3
+usr/share/games/jedi-academy/base/assets2.pk3 usr/lib/openjk/JediAcademy/base/assets2.pk3
+usr/share/games/jedi-academy/base/assets3.pk3 usr/lib/openjk/JediAcademy/base/assets3.pk3
diff --git a/debian/openjk-outcast.install b/debian/openjk-outcast.install
index 9a3290a..82e2a7a 100644
--- a/debian/openjk-outcast.install
+++ b/debian/openjk-outcast.install
@@ -1,18 +1,15 @@
# Single-player game
debian/scripts/openjo_sp usr/games
-usr/lib/openjk/openjo_sp usr/lib/openjk-outcast
-usr/lib/openjk/openjo_sp.* usr/lib/openjk-outcast
-usr/lib/openjk/rdjosp-vanilla_*.so usr/lib/openjk-outcast
debian/openjo_sp.desktop usr/share/applications
-usr/lib/openjk/OpenJK/jospgame*.so
-# Symlinks
-usr/lib/openjk-outcast/OpenJK/jospgame*.so
-usr/lib/openjk-outcast/base/jospgame*.so
-# These would be used by MP too, if we had it
-usr/lib/openjk-outcast/OpenJK/cgame*.so
-usr/lib/openjk-outcast/base/cgame*.so
-usr/lib/openjk-outcast/OpenJK/ui*.so
-usr/lib/openjk-outcast/base/ui*.so
+usr/lib/openjk/JediOutcast/openjo_sp
+usr/lib/openjk/JediOutcast/openjo_sp.*
+usr/lib/openjk/JediOutcast/rdjosp-vanilla_*.so
+usr/lib/openjk/JediOutcast/OpenJK/jospgame*.so
+usr/lib/openjk/JediOutcast/base/jospgame*.so
-# These would need to move to openjk-common if we had JK2 multiplayer
-debian/README.jedi-outcast-data usr/lib/openjk-outcast
+# These would be used by MP too, if we had it
+debian/README.jedi-outcast-data usr/lib/openjk/JediOutcast
+usr/lib/openjk/JediOutcast/OpenJK/cgame*.so
+usr/lib/openjk/JediOutcast/OpenJK/ui*.so
+usr/lib/openjk/JediOutcast/base/cgame*.so
+usr/lib/openjk/JediOutcast/base/ui*.so
diff --git a/debian/openjk-outcast.links b/debian/openjk-outcast.links
index 27f40ac..0656c09 100644
--- a/debian/openjk-outcast.links
+++ b/debian/openjk-outcast.links
@@ -1,5 +1,5 @@
# These would move to openjk-common if we had Jedi Outcast multiplayer
-usr/share/games/jedi-outcast/base/assets0.pk3 usr/lib/openjk-outcast/base/assets0.pk3
-usr/share/games/jedi-outcast/base/assets1.pk3 usr/lib/openjk-outcast/base/assets1.pk3
-usr/share/games/jedi-outcast/base/assets2.pk3 usr/lib/openjk-outcast/base/assets2.pk3
-usr/share/games/jedi-outcast/base/assets5.pk3 usr/lib/openjk-outcast/base/assets5.pk3
+usr/share/games/jedi-outcast/base/assets0.pk3 usr/lib/openjk/JediOutcast/base/assets0.pk3
+usr/share/games/jedi-outcast/base/assets1.pk3 usr/lib/openjk/JediOutcast/base/assets1.pk3
+usr/share/games/jedi-outcast/base/assets2.pk3 usr/lib/openjk/JediOutcast/base/assets2.pk3
+usr/share/games/jedi-outcast/base/assets5.pk3 usr/lib/openjk/JediOutcast/base/assets5.pk3
diff --git a/debian/rules b/debian/rules
index c8f41cb..dc02f39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,22 +47,23 @@ override_dh_auto_build: debian/icons
override_dh_auto_install: debian/icons
dh_auto_install
- cd debian/tmp/usr/lib/openjk && ln -s openjo_sp.* openjo_sp
- cd debian/tmp/usr/lib/openjk && ln -s openjk_sp.* openjk_sp
- cd debian/tmp/usr/lib/openjk && ln -s openjk.* openjk
- cd debian/tmp/usr/lib/openjk && ln -s openjkded.* openjkded
- install -d debian/tmp/usr/lib/openjk-academy/OpenJK
- cd debian/tmp/usr/lib/openjk-academy/OpenJK && ln -s ../../openjk/OpenJK/*.so .
- install -d debian/tmp/usr/lib/openjk-academy/base
- cd debian/tmp/usr/lib/openjk-academy/base && ln -s ../../openjk/OpenJK/*.so .
- install -d debian/tmp/usr/lib/openjk-outcast/OpenJK
- cd debian/tmp/usr/lib/openjk-outcast/OpenJK && ln -s ../../openjk/OpenJK/*.so .
- install -d debian/tmp/usr/lib/openjk-outcast/base
- cd debian/tmp/usr/lib/openjk-outcast/base && ln -s ../../openjk/OpenJK/*.so .
+ cd debian/tmp/usr/lib/openjk/JediOutcast && ln -s openjo_sp.* openjo_sp
+ cd debian/tmp/usr/lib/openjk/JediAcademy && ln -s openjk_sp.* openjk_sp
+ cd debian/tmp/usr/lib/openjk/JediAcademy && ln -s openjk.* openjk
+ cd debian/tmp/usr/lib/openjk/JediAcademy && ln -s openjkded.* openjkded
+ install -d debian/tmp/usr/lib/openjk/JediAcademy/base
+ rm -fv debian/tmp/usr/lib/openjk/JediAcademy/base/*.so
+ cd debian/tmp/usr/lib/openjk/JediAcademy/base && ln -nfsv ../OpenJK/*.so .
+ install -d debian/tmp/usr/lib/openjk/JediOutcast/OpenJK
+ cd debian/tmp/usr/lib/openjk/JediOutcast/OpenJK && ln -s ../../JediAcademy/OpenJK/*.so .
+ install -d debian/tmp/usr/lib/openjk/JediOutcast/base
+ rm -fv debian/tmp/usr/lib/openjk/JediOutcast/base/*.so
+ cd debian/tmp/usr/lib/openjk/JediOutcast/base && ln -s ../OpenJK/jospgame*.so .
+ cd debian/tmp/usr/lib/openjk/JediOutcast/base && ln -s ../../JediAcademy/OpenJK/*.so .
sed \
-e 's!@IOQ3BINARY@!openjk_sp!' \
-e 's!@IOQ3SELF@!openjk_sp!' \
- -e 's!@LIBDIR@!openjk-academy!' \
+ -e 's!@LIBDIR@!openjk/JediAcademy!' \
-e 's!@DATA@!jedi-academy-data!' \
-e 's!@IOQ3GAME@!Jedi Academy!' \
-e 's!@IOQ3ROLE@!single-player!' \
@@ -70,7 +71,7 @@ override_dh_auto_install: debian/icons
sed \
-e 's!@IOQ3BINARY@!openjo_sp!' \
-e 's!@IOQ3SELF@!openjo_sp!' \
- -e 's!@LIBDIR@!openjk-outcast!' \
+ -e 's!@LIBDIR@!openjk/JediOutcast!' \
-e 's!@DATA@!jedi-outcast-data!' \
-e 's!@IOQ3GAME@!Jedi Knight II: Jedi Outcast!' \
-e 's!@IOQ3ROLE@!single-player!' \
@@ -78,7 +79,7 @@ override_dh_auto_install: debian/icons
sed \
-e 's!@IOQ3BINARY@!openjk!' \
-e 's!@IOQ3SELF@!openjk!' \
- -e 's!@LIBDIR@!openjk-academy!' \
+ -e 's!@LIBDIR@!openjk/JediAcademy!' \
-e 's!@DATA@!jedi-academy-data!' \
-e 's!@IOQ3GAME@!Jedi Academy!' \
-e 's!@IOQ3ROLE@!multiplayer!' \
@@ -86,7 +87,7 @@ override_dh_auto_install: debian/icons
sed \
-e 's!@IOQ3BINARY@!openjkded!' \
-e 's!@IOQ3SELF@!openjkded!' \
- -e 's!@LIBDIR@!openjk-academy!' \
+ -e 's!@LIBDIR@!openjk/JediAcademy!' \
-e 's!@DATA@!jedi-academy-data!' \
-e 's!@IOQ3GAME@!Jedi Academy!' \
-e 's!@IOQ3ROLE@!server!' \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list