[quake] 01/10: quake2: execute debian_server.cfg again, reverting a change from v9

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository quake.

commit 0f76721c9aa3a544458ea66bdd60ee6591863187
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 26 11:14:54 2015 +0000

    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.
---
 debian/changelog                   | 3 +++
 debian/quake2-server.README.Debian | 9 ++++++---
 debian/quake2-server.default       | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c96efff..3ce3764 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 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: 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/quake2-server.README.Debian b/debian/quake2-server.README.Debian
index 7298b5c..832a35c 100644
--- a/debian/quake2-server.README.Debian
+++ b/debian/quake2-server.README.Debian
@@ -30,11 +30,14 @@ can find Quake files in /var/games/quake2-server/.yq2 or similar.
 The /etc/quake2-server directory is symlinked into the game engine's
 search path as etc/quake2-server, so you can place files there and execute
 them with commands like "exec etc/quake2-server/ctf.cfg".
-By default, the init script will use etc/quake2-server/server.cfg.
+
+In addition, debian_server.cfg in the engine's search path is also a symlink
+to either /etc/quake2-server/debian_server.cfg or
+/etc/quake2-server/demo/debian_server.cfg, depending whether you
+are using the demo data or the full game. By default, the init script will
+execute debian_server.cfg.
 
 For compatibility with older versions of the quake-server package,
-debian_server.cfg in the engine's search path is also a symlink to
-etc/quake2-server/server.cfg.
 
 The server can be managed in the usual way, e.g. via service(8)
 and update-rc.d(8) commands like
diff --git a/debian/quake2-server.default b/debian/quake2-server.default
index 3b21382..69849bb 100644
--- a/debian/quake2-server.default
+++ b/debian/quake2-server.default
@@ -3,5 +3,5 @@
 # installed at /etc/default/quake2-server by the maintainer scripts
 
 # Additional options that are passed to the daemon.
-# For most options it's better to edit server.cfg instead.
-DAEMON_OPTS="+exec etc/quake2-server/server.cfg"
+# For most options it's better to edit debian_server.cfg instead.
+DAEMON_OPTS="+exec debian_server.cfg"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/quake.git