[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8.3-3-4-g8f5d414

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit a519aa4a3d44dcdc1d16f38893361163748b959a
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Wed Aug 18 21:34:13 2010 +0200

    Ship default file for server init script

diff --git a/debian/changelog b/debian/changelog
index 7c92fb0..afbf8f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wesnoth-1.8 (1:1.8.3-4) unstable; urgency=low
+
+  * Ship default file for the server init script and adapt the init script to
+    use the script name instead of the binary name for the default file.
+
+ -- 
+
 wesnoth-1.8 (1:1.8.3-3) unstable; urgency=low
 
   * Make wesnoth and wesnoth-core packages directly depend on
diff --git a/debian/wesnoth-1.8-server.default b/debian/wesnoth-1.8-server.default
new file mode 100644
index 0000000..fa19270
--- /dev/null
+++ b/debian/wesnoth-1.8-server.default
@@ -0,0 +1,13 @@
+# Defaults for wesnoth-1.8-server initscript
+# sourced by /etc/init.d/wesnoth-1.8-server
+# installed at /etc/default/wesnoth-1.8-server
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+# You will have to create the config file if you want to change the
+# default options that the server runs with.
+# See wesnothd-1.8(6) for the syntax of the configuration file.
+#DAEMON_OPTS="-c /etc/wesnothd-1.8.cfg"
diff --git a/debian/wesnoth-1.8-server.init.d b/debian/wesnoth-1.8-server.init.d
index 180c023..36f2daa 100644
--- a/debian/wesnoth-1.8-server.init.d
+++ b/debian/wesnoth-1.8-server.init.d
@@ -12,7 +12,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/games/wesnothd-1.8
 DAEMON_OPTS=
-NAME=wesnothd-1.8
+NAME=wesnoth-1.8-server
 DESC="Wesnoth server (1.8)"
 PIDFILE=/var/run/$NAME.pid
 
diff --git a/debian/wesnoth-BRANCH-server.default.in b/debian/wesnoth-BRANCH-server.default.in
new file mode 100644
index 0000000..713d75a
--- /dev/null
+++ b/debian/wesnoth-BRANCH-server.default.in
@@ -0,0 +1,13 @@
+# Defaults for wesnoth-BRANCH-server initscript
+# sourced by /etc/init.d/wesnoth-BRANCH-server
+# installed at /etc/default/wesnoth-BRANCH-server
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+# You will have to create the config file if you want to change the
+# default options that the server runs with.
+# See wesnothd-BRANCH(6) for the syntax of the configuration file.
+#DAEMON_OPTS="-c /etc/wesnothd-BRANCH.cfg"
diff --git a/debian/wesnoth-BRANCH-server.init.d.in b/debian/wesnoth-BRANCH-server.init.d.in
index ce88c64..882da02 100644
--- a/debian/wesnoth-BRANCH-server.init.d.in
+++ b/debian/wesnoth-BRANCH-server.init.d.in
@@ -12,7 +12,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/games/wesnothd-BRANCH
 DAEMON_OPTS=
-NAME=wesnothd-BRANCH
+NAME=wesnoth-BRANCH-server
 DESC="Wesnoth server (BRANCH)"
 PIDFILE=/var/run/$NAME.pid
 

-- 
Debian packaging of wesnoth