[openjk] 04/15: Use upstream's naming for executables and menu files
Simon McVittie
smcv at debian.org
Tue Dec 30 22:11:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository openjk.
commit 81a932eff68c738ff0d0c8f9277ce68cb02f314d
Author: Simon McVittie <smcv at debian.org>
Date: Tue Dec 30 18:40:22 2014 +0000
Use upstream's naming for executables and menu files
Also reshuffle package contents a bit.
---
debian/.gitignore | 2 +-
debian/openjk-academy-server.install | 4 +++-
debian/openjk-academy-server.links | 4 ----
debian/openjk-academy.install | 25 ++++++++++++++++------
debian/openjk-academy.menu | 4 ++--
debian/openjk-common.install | 14 ++++++------
.../{openjk-academy.links => openjk-common.links} | 2 ++
debian/openjk-outcast.install | 14 ++++++++++--
debian/openjk-outcast.links | 1 +
debian/openjk-outcast.menu | 2 +-
.../{openjk-academy-mp.desktop => openjk.desktop} | 2 +-
...openjk-academy-sp.desktop => openjk_sp.desktop} | 2 +-
...openjk-outcast-sp.desktop => openjo_sp.desktop} | 2 +-
debian/rules | 20 ++++++++---------
14 files changed, 59 insertions(+), 39 deletions(-)
diff --git a/debian/.gitignore b/debian/.gitignore
index c715d06..60277dd 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -5,7 +5,7 @@
/openjk-dbg/
/openjk-outcast/
/icons/
-/scripts/openjk-*
+/scripts/openj*
*.debhelper.log
*.substvars
/files
diff --git a/debian/openjk-academy-server.install b/debian/openjk-academy-server.install
index 5c9f3fe..edfac8b 100644
--- a/debian/openjk-academy-server.install
+++ b/debian/openjk-academy-server.install
@@ -1,3 +1,5 @@
-debian/scripts/openjk-academy-server usr/games
+# 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
diff --git a/debian/openjk-academy-server.links b/debian/openjk-academy-server.links
deleted file mode 100644
index c15af3d..0000000
--- a/debian/openjk-academy-server.links
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/games/jedi-academy-data/base/assets0.pk3 usr/lib/openjk-academy-server/base/assets0.pk3
-usr/share/games/jedi-academy-data/base/assets1.pk3 usr/lib/openjk-academy-server/base/assets1.pk3
-usr/share/games/jedi-academy-data/base/assets2.pk3 usr/lib/openjk-academy-server/base/assets2.pk3
-usr/share/games/jedi-academy-data/base/assets3.pk3 usr/lib/openjk-academy-server/base/assets3.pk3
diff --git a/debian/openjk-academy.install b/debian/openjk-academy.install
index be241b2..7521ec7 100644
--- a/debian/openjk-academy.install
+++ b/debian/openjk-academy.install
@@ -1,13 +1,24 @@
-debian/openjk-academy-mp.desktop usr/share/applications
-debian/openjk-academy-sp.desktop usr/share/applications
-debian/scripts/openjk-academy-sp usr/games
-debian/scripts/openjk-academy-mp usr/games
+# 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/openjk usr/lib/openjk-academy
-usr/lib/openjk/openjk.* usr/lib/openjk-academy
usr/lib/openjk/rdsp-*.so usr/lib/openjk-academy
-usr/lib/openjk/rd-*.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
+
+# 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
diff --git a/debian/openjk-academy.menu b/debian/openjk-academy.menu
index f706a1f..b539744 100644
--- a/debian/openjk-academy.menu
+++ b/debian/openjk-academy.menu
@@ -1,6 +1,6 @@
?package(openjk-academy):needs="X11" section="Games/Action"\
icon="/usr/share/pixmaps/openjk.xpm" \
- title="Jedi Academy" command="/usr/games/openjk-academy-sp --quiet"
+ title="Jedi Academy" command="/usr/games/openjk_sp --quiet"
?package(openjk-academy):needs="X11" section="Games/Action"\
icon="/usr/share/pixmaps/openjk.xpm" \
- title="Jedi Academy multiplayer" command="/usr/games/openjk-academy-mp --quiet"
+ title="Jedi Academy multiplayer" command="/usr/games/openjk --quiet"
diff --git a/debian/openjk-common.install b/debian/openjk-common.install
index dc7095d..616788d 100644
--- a/debian/openjk-common.install
+++ b/debian/openjk-common.install
@@ -1,18 +1,16 @@
+# Shared by Jedi Academy and Jedi Outcast
debian/icons/openjk.xpm usr/share/pixmaps
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
-debian/README.jedi-academy-data usr/lib/openjk-academy
-debian/README.jedi-outcast-data usr/lib/openjk-outcast
usr/lib/openjk/OpenJK/cgame*.so
usr/lib/openjk/OpenJK/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
-usr/lib/openjk-academy/OpenJK/cgame*.so
-usr/lib/openjk-academy/OpenJK/ui*.so
+# Symlinks
usr/lib/openjk-academy/OpenJK/jampgame*.so
-usr/lib/openjk-academy/base/cgame*.so
-usr/lib/openjk-academy/base/ui*.so
usr/lib/openjk-academy/base/jampgame*.so
-usr/lib/openjk-outcast/OpenJK/cgame*.so
-usr/lib/openjk-outcast/OpenJK/ui*.so
diff --git a/debian/openjk-academy.links b/debian/openjk-common.links
similarity index 79%
rename from debian/openjk-academy.links
rename to debian/openjk-common.links
index 75d57ca..6dd9200 100644
--- a/debian/openjk-academy.links
+++ b/debian/openjk-common.links
@@ -1,3 +1,5 @@
+# These will be dangling links if only openjk-outcast is installed, but
+# that doesn't really matter.
usr/share/games/jedi-academy-data/base/assets0.pk3 usr/lib/openjk-academy/base/assets0.pk3
usr/share/games/jedi-academy-data/base/assets1.pk3 usr/lib/openjk-academy/base/assets1.pk3
usr/share/games/jedi-academy-data/base/assets2.pk3 usr/lib/openjk-academy/base/assets2.pk3
diff --git a/debian/openjk-outcast.install b/debian/openjk-outcast.install
index 2cecea8..9a3290a 100644
--- a/debian/openjk-outcast.install
+++ b/debian/openjk-outcast.install
@@ -1,8 +1,18 @@
-debian/openjk-outcast-sp.desktop usr/share/applications
-debian/scripts/openjk-outcast-sp usr/games
+# 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
+
+# These would need to move to openjk-common if we had JK2 multiplayer
+debian/README.jedi-outcast-data usr/lib/openjk-outcast
diff --git a/debian/openjk-outcast.links b/debian/openjk-outcast.links
index 315c7f3..65f8822 100644
--- a/debian/openjk-outcast.links
+++ b/debian/openjk-outcast.links
@@ -1,3 +1,4 @@
+# These would move to openjk-common if we had Jedi Outcast multiplayer
usr/share/games/jedi-outcast-data/base/assets0.pk3 usr/lib/openjk-outcast/base/assets0.pk3
usr/share/games/jedi-outcast-data/base/assets1.pk3 usr/lib/openjk-outcast/base/assets1.pk3
usr/share/games/jedi-outcast-data/base/assets2.pk3 usr/lib/openjk-outcast/base/assets2.pk3
diff --git a/debian/openjk-outcast.menu b/debian/openjk-outcast.menu
index 90f55da..4c5e799 100644
--- a/debian/openjk-outcast.menu
+++ b/debian/openjk-outcast.menu
@@ -1,3 +1,3 @@
?package(openjk-outcast):needs="X11" section="Games/Action"\
icon="/usr/share/pixmaps/openjk.xpm" \
- title="Jedi Knight II: Jedi Outcast" command="/usr/games/openjk-outcast-sp --quiet"
+ title="Jedi Knight II: Jedi Outcast" command="/usr/games/openjo_sp --quiet"
diff --git a/debian/openjk-academy-mp.desktop b/debian/openjk.desktop
similarity index 73%
rename from debian/openjk-academy-mp.desktop
rename to debian/openjk.desktop
index f9419ba..2261601 100644
--- a/debian/openjk-academy-mp.desktop
+++ b/debian/openjk.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=Jedi Academy multiplayer
-Exec=/usr/games/openjk-academy-mp --quiet
+Exec=/usr/games/openjk --quiet
Terminal=false
Icon=openjk
Type=Application
diff --git a/debian/openjk-academy-sp.desktop b/debian/openjk_sp.desktop
similarity index 71%
rename from debian/openjk-academy-sp.desktop
rename to debian/openjk_sp.desktop
index 850917f..f04c194 100644
--- a/debian/openjk-academy-sp.desktop
+++ b/debian/openjk_sp.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=Jedi Academy
-Exec=/usr/games/openjk-academy-sp --quiet
+Exec=/usr/games/openjk_sp --quiet
Terminal=false
Icon=openjk
Type=Application
diff --git a/debian/openjk-outcast-sp.desktop b/debian/openjo_sp.desktop
similarity index 74%
rename from debian/openjk-outcast-sp.desktop
rename to debian/openjo_sp.desktop
index 3434596..145d328 100644
--- a/debian/openjk-outcast-sp.desktop
+++ b/debian/openjo_sp.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Name=Jedi Knight II: Jedi Outcast
-Exec=/usr/games/openjk-outcast-sp --quiet
+Exec=/usr/games/openjo_sp --quiet
Terminal=false
Icon=openjk
Type=Application
diff --git a/debian/rules b/debian/rules
index 71cec78..51dafa6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,37 +61,37 @@ override_dh_auto_install: debian/icons
cd debian/tmp/usr/lib/openjk-outcast/base && ln -s ../../openjk/OpenJK/*.so .
sed \
-e 's!@IOQ3BINARY@!openjk_sp!' \
- -e 's!@IOQ3SELF@!openjk-academy-sp!' \
+ -e 's!@IOQ3SELF@!openjk_sp!' \
-e 's!@LIBDIR@!openjk-academy!' \
-e 's!@DATA@!jedi-academy-data!' \
-e 's!@IOQ3GAME@!Jedi Academy!' \
-e 's!@IOQ3ROLE@!single-player!' \
- < debian/scripts/jedi.in > debian/scripts/openjk-academy-sp
+ < debian/scripts/jedi.in > debian/scripts/openjk_sp
sed \
-e 's!@IOQ3BINARY@!openjo_sp!' \
- -e 's!@IOQ3SELF@!openjk-outcast-sp!' \
+ -e 's!@IOQ3SELF@!openjo_sp!' \
-e 's!@LIBDIR@!openjk-outcast!' \
-e 's!@DATA@!jedi-outcast-data!' \
- -e 's!@IOQ3GAME@!Jedi Knight II!' \
+ -e 's!@IOQ3GAME@!Jedi Knight II: Jedi Outcast!' \
-e 's!@IOQ3ROLE@!single-player!' \
- < debian/scripts/jedi.in > debian/scripts/openjk-outcast-sp
+ < debian/scripts/jedi.in > debian/scripts/openjo_sp
sed \
-e 's!@IOQ3BINARY@!openjk!' \
- -e 's!@IOQ3SELF@!openjk-academy-mp!' \
+ -e 's!@IOQ3SELF@!openjk!' \
-e 's!@LIBDIR@!openjk-academy!' \
-e 's!@DATA@!jedi-academy-data!' \
-e 's!@IOQ3GAME@!Jedi Academy!' \
-e 's!@IOQ3ROLE@!multiplayer!' \
- < debian/scripts/jedi.in > debian/scripts/openjk-academy-mp
+ < debian/scripts/jedi.in > debian/scripts/openjk
sed \
-e 's!@IOQ3BINARY@!openjkded!' \
- -e 's!@IOQ3SELF@!openjk-academy-server!' \
+ -e 's!@IOQ3SELF@!openjkded!' \
-e 's!@LIBDIR@!openjk-academy!' \
-e 's!@DATA@!jedi-academy-data!' \
-e 's!@IOQ3GAME@!Jedi Academy!' \
-e 's!@IOQ3ROLE@!server!' \
- < debian/scripts/jedi.in > debian/scripts/openjk-academy-server
- chmod 0755 debian/scripts/openjk-*
+ < debian/scripts/jedi.in > debian/scripts/openjkded
+ chmod 0755 debian/scripts/openj*
debian/icons: debian/rules
install -d debian/icons/512 debian/icons/128 \
--
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