This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch debian/master in repository iortcw.
commit 455e185bbf0af4162ce08f686a6d28a5435dc57b Author: Simon McVittie <[email protected]> Date: Sat Oct 1 17:58:23 2016 +0100 Write generated scripts directly into debian/tmp/usr/games --- debian/changelog | 1 + debian/clean | 3 --- debian/rtcw-server.install | 2 +- debian/rtcw.install | 4 ++-- debian/rules | 11 +++++------ 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index cde9695..2f00eed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ iortcw (1.42d+dfsg1-5) UNRELEASED; urgency=medium * Always do a "release" build. Override OPTIMIZE to empty instead of using upstream's "debug" build for noopt. * Use upstream's copyfiles (install) target instead of reimplementing it + * Write generated scripts directly into debian/tmp/usr/games -- Simon McVittie <[email protected]> Thu, 22 Sep 2016 09:16:38 +0100 diff --git a/debian/clean b/debian/clean deleted file mode 100644 index a6f09de..0000000 --- a/debian/clean +++ /dev/null @@ -1,3 +0,0 @@ -debian/scripts/wolfded -debian/scripts/wolfmp -debian/scripts/wolfsp diff --git a/debian/rtcw-server.install b/debian/rtcw-server.install index 258bf76..36ec65c 100644 --- a/debian/rtcw-server.install +++ b/debian/rtcw-server.install @@ -1,6 +1,6 @@ debian/apparmor.d/usr.lib.rtcw.iowolfded etc/apparmor.d debian/[email protected] lib/systemd/system -debian/scripts/wolfded usr/games debian/server.cfg etc/rtcw-server +usr/games/wolfded usr/lib/rtcw/iowolfded usr/lib/rtcw/iowolfded.* diff --git a/debian/rtcw.install b/debian/rtcw.install index 6b69575..682b310 100644 --- a/debian/rtcw.install +++ b/debian/rtcw.install @@ -3,10 +3,10 @@ debian/32/*.png usr/share/icons/hicolor/32x32/apps debian/48/*.png usr/share/icons/hicolor/48x48/apps debian/apparmor.d/usr.lib.rtcw etc/apparmor.d debian/need-data.sh usr/lib/rtcw -debian/scripts/wolfmp usr/games -debian/scripts/wolfsp usr/games debian/wolfmp.desktop usr/share/applications debian/wolfsp.desktop usr/share/applications +usr/games/wolfmp +usr/games/wolfsp usr/lib/rtcw/iowolfmp usr/lib/rtcw/iowolfmp.* usr/lib/rtcw/iowolfsp diff --git a/debian/rules b/debian/rules index c04d6f1..760589e 100755 --- a/debian/rules +++ b/debian/rules @@ -72,24 +72,23 @@ override_dh_auto_install: copyfiles cd debian/tmp/usr/lib/rtcw && ln -s iowolfmp.* iowolfmp cd debian/tmp/usr/lib/rtcw && ln -s iowolfded.* iowolfded + install -d debian/tmp/usr/games sed \ -e 's!@IOQ3BINARY@!iowolfsp!' \ -e 's!@IOQ3SELF@!wolfsp!' \ -e 's!@IOQ3ROLE@!single-player!' \ - < debian/scripts/rtcw.in > debian/scripts/wolfsp + < debian/scripts/rtcw.in > debian/tmp/usr/games/wolfsp sed \ -e 's!@IOQ3BINARY@!iowolfmp!' \ -e 's!@IOQ3SELF@!wolfmp!' \ -e 's!@IOQ3ROLE@!multiplayer!' \ - < debian/scripts/rtcw.in > debian/scripts/wolfmp + < debian/scripts/rtcw.in > debian/tmp/usr/games/wolfmp sed \ -e 's!@IOQ3BINARY@!iowolfded!' \ -e 's!@IOQ3SELF@!wolfded!' \ -e 's!@IOQ3ROLE@!multiplayer server!' \ - < debian/scripts/rtcw.in > debian/scripts/wolfded - chmod +x debian/scripts/wolfsp - chmod +x debian/scripts/wolfmp - chmod +x debian/scripts/wolfded + < debian/scripts/rtcw.in > debian/tmp/usr/games/wolfded + chmod +x debian/tmp/usr/games/* ifeq ($(DEB_HOST_ARCH_OS),linux) override_dh_install-arch: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
