[iortcw] 03/10: Use more upstream-ish naming for scripts, menu entries etc.
Simon McVittie
smcv at debian.org
Tue Dec 30 22:11:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch master
in repository iortcw.
commit 5fc0a2b8f9d269ca647ef1f57cc5b1c58c612d94
Author: Simon McVittie <smcv at debian.org>
Date: Tue Dec 30 18:06:49 2014 +0000
Use more upstream-ish naming for scripts, menu entries etc.
---
debian/.gitignore | 6 ++---
debian/32/{rtcw-mp.png => wolfmp.png} | Bin
debian/32/{rtcw-sp.png => wolfsp.png} | Bin
debian/48/{rtcw-mp.png => wolfmp.png} | Bin
debian/48/{rtcw-sp.png => wolfsp.png} | Bin
debian/clean | 6 ++---
debian/rtcw-server.install | 3 +--
debian/rtcw-sp.desktop | 7 ------
debian/rtcw.install | 8 +++----
debian/rules | 34 ++++++++++++++---------------
debian/source/include-binaries | 8 +++----
debian/{rtcw-mp.desktop => wolfmp.desktop} | 4 ++--
debian/{rtcw-mp.svg => wolfmp.svg} | 0
debian/wolfsp.desktop | 7 ++++++
debian/{rtcw-sp.svg => wolfsp.svg} | 0
15 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/debian/.gitignore b/debian/.gitignore
index 38404ac..eab2190 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -6,6 +6,6 @@
/rtcw-common/
/rtcw-dbg/
/rtcw-server/
-/scripts/rtcw-mp
-/scripts/rtcw-server
-/scripts/rtcw-sp
+/scripts/wolfded
+/scripts/wolfmp
+/scripts/wolfsp
diff --git a/debian/32/rtcw-mp.png b/debian/32/wolfmp.png
similarity index 100%
rename from debian/32/rtcw-mp.png
rename to debian/32/wolfmp.png
diff --git a/debian/32/rtcw-sp.png b/debian/32/wolfsp.png
similarity index 100%
rename from debian/32/rtcw-sp.png
rename to debian/32/wolfsp.png
diff --git a/debian/48/rtcw-mp.png b/debian/48/wolfmp.png
similarity index 100%
rename from debian/48/rtcw-mp.png
rename to debian/48/wolfmp.png
diff --git a/debian/48/rtcw-sp.png b/debian/48/wolfsp.png
similarity index 100%
rename from debian/48/rtcw-sp.png
rename to debian/48/wolfsp.png
diff --git a/debian/clean b/debian/clean
index 71afc81..a6f09de 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,3 +1,3 @@
-debian/scripts/rtcw-mp
-debian/scripts/rtcw-mp-server
-debian/scripts/rtcw-sp
+debian/scripts/wolfded
+debian/scripts/wolfmp
+debian/scripts/wolfsp
diff --git a/debian/rtcw-server.install b/debian/rtcw-server.install
index 46794a8..aba6177 100644
--- a/debian/rtcw-server.install
+++ b/debian/rtcw-server.install
@@ -1,4 +1,3 @@
debian/build/mp/iowolfded usr/lib/rtcw
debian/build/mp/iowolfded.* usr/lib/rtcw
-debian/scripts/rtcw-server usr/games
-debian/README.rtcw-data usr/share/doc/rtcw-server
+debian/scripts/wolfded usr/games
diff --git a/debian/rtcw-sp.desktop b/debian/rtcw-sp.desktop
deleted file mode 100644
index a1edf4a..0000000
--- a/debian/rtcw-sp.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Return to Castle Wolfenstein single-player
-Exec=/usr/games/rtcw-sp --quiet
-Terminal=false
-Icon=rtcw-sp
-Type=Application
-Categories=Game;ArcadeGame;
diff --git a/debian/rtcw.install b/debian/rtcw.install
index 66ba63c..155bf04 100644
--- a/debian/rtcw.install
+++ b/debian/rtcw.install
@@ -5,10 +5,10 @@ debian/build/mp/iowolfmp* usr/lib/rtcw
debian/build/mp/iowolfmp.* usr/lib/rtcw
debian/build/mp/renderer*.so usr/lib/rtcw
debian/need-data.sh usr/lib/rtcw
-debian/rtcw-sp.desktop usr/share/applications
-debian/rtcw-mp.desktop usr/share/applications
-debian/scripts/rtcw-sp usr/games
-debian/scripts/rtcw-mp usr/games
+debian/wolfsp.desktop usr/share/applications
+debian/wolfmp.desktop usr/share/applications
+debian/scripts/wolfsp usr/games
+debian/scripts/wolfmp usr/games
debian/32/*.png usr/share/icons/hicolor/32x32/apps
debian/48/*.png usr/share/icons/hicolor/48x48/apps
debian/*.svg usr/share/icons/hicolor/scalable/apps
diff --git a/debian/rules b/debian/rules
index 607b794..718f05a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,22 +60,22 @@ override_dh_auto_build:
cd debian/build/mp && ln -s iowolfded.* iowolfded
sed \
-e 's!@IOQ3BINARY@!iowolfsp!' \
- -e 's!@IOQ3SELF@!rtcw-sp!' \
+ -e 's!@IOQ3SELF@!wolfsp!' \
-e 's!@IOQ3ROLE@!single-player!' \
- < debian/scripts/rtcw.in > debian/scripts/rtcw-sp
+ < debian/scripts/rtcw.in > debian/scripts/wolfsp
sed \
-e 's!@IOQ3BINARY@!iowolfmp!' \
- -e 's!@IOQ3SELF@!rtcw-mp!' \
+ -e 's!@IOQ3SELF@!wolfmp!' \
-e 's!@IOQ3ROLE@!multiplayer!' \
- < debian/scripts/rtcw.in > debian/scripts/rtcw-mp
+ < debian/scripts/rtcw.in > debian/scripts/wolfmp
sed \
-e 's!@IOQ3BINARY@!iowolfded!' \
- -e 's!@IOQ3SELF@!rtcw-server!' \
+ -e 's!@IOQ3SELF@!wolfded!' \
-e 's!@IOQ3ROLE@!multiplayer server!' \
- < debian/scripts/rtcw.in > debian/scripts/rtcw-server
- chmod +x debian/scripts/rtcw-sp
- chmod +x debian/scripts/rtcw-mp
- chmod +x debian/scripts/rtcw-server
+ < debian/scripts/rtcw.in > debian/scripts/wolfded
+ chmod +x debian/scripts/wolfsp
+ chmod +x debian/scripts/wolfmp
+ chmod +x debian/scripts/wolfded
override_dh_strip:
dh_strip --dbg-package=rtcw-dbg
@@ -93,15 +93,15 @@ override_dh_auto_clean:
# Not done automatically to avoid a build-dependency on inkscape
maintainer-update-icons: \
- debian/32/rtcw-sp.png \
- debian/48/rtcw-sp.png \
- debian/32/rtcw-mp.png \
- debian/48/rtcw-mp.png \
+ debian/32/wolfsp.png \
+ debian/48/wolfsp.png \
+ debian/32/wolfmp.png \
+ debian/48/wolfmp.png \
$(NULL)
- inkscape -C -w 32 -h 32 --export-png=debian/32/rtcw-sp.png debian/rtcw-sp.svg
- inkscape -C -w 48 -h 48 --export-png=debian/48/rtcw-sp.png debian/rtcw-sp.svg
- inkscape -C -w 32 -h 32 --export-png=debian/32/rtcw-mp.png debian/rtcw-mp.svg
- inkscape -C -w 48 -h 48 --export-png=debian/48/rtcw-mp.png debian/rtcw-mp.svg
+ inkscape -C -w 32 -h 32 --export-png=debian/32/wolfsp.png debian/wolfsp.svg
+ inkscape -C -w 48 -h 48 --export-png=debian/48/wolfsp.png debian/wolfsp.svg
+ inkscape -C -w 32 -h 32 --export-png=debian/32/wolfmp.png debian/wolfmp.svg
+ inkscape -C -w 48 -h 48 --export-png=debian/48/wolfmp.png debian/wolfmp.svg
ORIG_REL = 1.42b
# Empty if upstream ever get round to tagging a release
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index fa93e18..2eb1141 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1,4 +1,4 @@
-debian/32/rtcw-sp.png
-debian/48/rtcw-sp.png
-debian/32/rtcw-mp.png
-debian/48/rtcw-mp.png
+debian/32/wolfsp.png
+debian/48/wolfsp.png
+debian/32/wolfmp.png
+debian/48/wolfmp.png
diff --git a/debian/rtcw-mp.desktop b/debian/wolfmp.desktop
similarity index 73%
rename from debian/rtcw-mp.desktop
rename to debian/wolfmp.desktop
index 5d3419f..aa2ed3e 100644
--- a/debian/rtcw-mp.desktop
+++ b/debian/wolfmp.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Return to Castle Wolfenstein multiplayer
-Exec=/usr/games/rtcw-mp --quiet
+Exec=/usr/games/wolfmp --quiet
Terminal=false
-Icon=rtcw-mp
+Icon=wolfmp
Type=Application
Categories=Game;ArcadeGame;
diff --git a/debian/rtcw-mp.svg b/debian/wolfmp.svg
similarity index 100%
rename from debian/rtcw-mp.svg
rename to debian/wolfmp.svg
diff --git a/debian/wolfsp.desktop b/debian/wolfsp.desktop
new file mode 100644
index 0000000..2a59e4e
--- /dev/null
+++ b/debian/wolfsp.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Return to Castle Wolfenstein
+Exec=/usr/games/wolfsp --quiet
+Terminal=false
+Icon=wolfsp
+Type=Application
+Categories=Game;ArcadeGame;
diff --git a/debian/rtcw-sp.svg b/debian/wolfsp.svg
similarity index 100%
rename from debian/rtcw-sp.svg
rename to debian/wolfsp.svg
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git
More information about the Pkg-games-commits
mailing list