This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch quake in repository game-data-packager.
commit 2f29ad4ab075032c69c28eeef9921b9b09a48d5e Author: Simon McVittie <s...@debian.org> Date: Mon Jan 26 09:33:04 2015 +0000 quake3: modify quake3-server configuration - remove START_DAEMON from /etc/default/quake3-server - put defaults for START_DAEMON and DAEMON_OPTS in /etc/init.d/quake3-server so it can operate without /e/d/q3-s --- debian/changelog | 4 ++++ debian/quake3-server.default | 9 ++++----- debian/quake3-server.init | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ce3764..78b1c9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ quake (10) UNRELEASED; urgency=medium * quake2: execute debian_server.cfg again, reverting a change from v9. Unlike quake and quake3, quake2's default configuration file is named debian_server.cfg, and the demo and full game have different versions. + * quake3: modify quake3-server configuration + - remove START_DAEMON from /etc/default/quake3-server + - put defaults for START_DAEMON and DAEMON_OPTS in + /etc/init.d/quake3-server so it can operate without /e/d/q3-s * quake3: prefer to load game data from /usr/lib/quake3/base or /usr/lib/quake3/ta, where ioquake3 can provide native-code game modules - this requires ioquake3 (>= 1.36+u20150114+dfsg1-1~) and diff --git a/debian/quake3-server.default b/debian/quake3-server.default index 8d725f4..e4e4437 100644 --- a/debian/quake3-server.default +++ b/debian/quake3-server.default @@ -2,11 +2,10 @@ # sourced by /etc/init.d/quake3-server # installed at /etc/default/quake3-server by the maintainer scripts -# To disable the server, please use the normal mechanisms provided by init: -# see /usr/share/doc/quake3-server/README.Debian.gz. Changing the value -# of this variable is deprecated. -START_DAEMON=unless-disabled-by-upgrade - # Additional options that are passed to the daemon. # For most options it's better to edit server.cfg instead. DAEMON_OPTS="+exec etc/quake3-server/server.cfg" + +# To disable the server, please use the normal mechanisms provided by init: +# see /usr/share/doc/quake3-server/README.Debian.gz. The START_DAEMON +# variable is deprecated and should not be used. diff --git a/debian/quake3-server.init b/debian/quake3-server.init index 4e0296a..5a5596f 100644 --- a/debian/quake3-server.init +++ b/debian/quake3-server.init @@ -17,6 +17,8 @@ DESC="Quake III Arena dedicated server" PIDFILE="/var/run/$NAME.pid" BINARY="/usr/lib/ioquake3/ioq3ded" USER="Debian-quake3" +START_DAEMON=unless-disabled-by-upgrade +DAEMON_OPTS="+exec etc/quake3-server/server.cfg" test -x $DAEMON || exit 0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits