[tryton-debian-vcs] tryton-server branch debian updated. debian/3.6.3-2-4-g05b61f4

[Mathias Behrle]

The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/3.6.3-2-4-g05b61f4

commit 05b61f4381a6579361d8b5692e03149f469e0a34
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 27 10:57:42 2015 +0100

    Releasing debian version 3.6.3-3.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index dae233a..4befbbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-server (3.6.3-3) unstable; urgency=medium
+
+  * Reverting partly 3d6be619141e3ca0390459b6cfaa22b323be2101.
+  * Removing initial space in DAEMON_OPTS in tryton-server.default
+    (Closes: #803066).
+  * Adding the cron option also to the default DAEMON_OPTS in the init
+    script.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 27 Oct 2015 10:57:08 +0100
+
 tryton-server (3.6.3-2) unstable; urgency=medium
 
   * Removing libreoffice* from Suggests.
commit bcff681096191e27f11615c959916d280bd35182
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 27 10:50:47 2015 +0100

    Adding the cron option also to the default DAEMON_OPTS in the init script.

diff --git a/debian/tryton-server.init b/debian/tryton-server.init
index 5639c93..765dbb3 100644
--- a/debian/tryton-server.init
+++ b/debian/tryton-server.init
@@ -26,7 +26,7 @@ PIDFILE="${PIDDIR}/${NAME}.pid"
 LOGCONF="/etc/tryton/${NAME}_log.conf"
 DEFAULTS="/etc/default/tryton-server"
 CONFIGFILE="/etc/tryton/${NAME}.conf"
-DAEMON_OPTS="--config ${CONFIGFILE} --logconf ${LOGCONF}"
+DAEMON_OPTS="--config ${CONFIGFILE} --logconf ${LOGCONF} --cron"
 
 # Include tryton-server defaults if available
 if [ -r "${DEFAULTS}" ]
commit e988f1e58db8f94e38e427d6efaef30f2a2e3ef7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 27 10:45:13 2015 +0100

    Removing initial space in DAEMON_OPTS in tryton-server.default (Closes: #803066).
    
    This space was needed some time ago, but now leads to a crashing init.

diff --git a/debian/tryton-server.default b/debian/tryton-server.default
index 1ed770c..8f8cc54 100644
--- a/debian/tryton-server.default
+++ b/debian/tryton-server.default
@@ -19,4 +19,4 @@ LOGCONF="/etc/tryton/trytond_log.conf"
 
 # Additional options that are passed to the Daemon.
 # i.e. to increase the verbosity of the server log add -v
-DAEMON_OPTS=" --config ${CONFIGFILE} --logconf ${LOGCONF} --cron"
+DAEMON_OPTS="--config ${CONFIGFILE} --logconf ${LOGCONF} --cron"
commit 0a04e4147c6a129b392227b7d1d234dafab53ed3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 27 10:39:26 2015 +0100

    Reverting partly 3d6be619141e3ca0390459b6cfaa22b323be2101.
    
    As #803066 reveals, at least the start-stop-daemon command does not need
    quoted variables, but even doesn't work with them. So we revert
    'Unifying quoting of variables in maintainer scipts.' partly to the
    state before 3.6.

diff --git a/debian/tryton-server.init b/debian/tryton-server.init
index dc9b259..5639c93 100644
--- a/debian/tryton-server.init
+++ b/debian/tryton-server.init
@@ -53,14 +53,14 @@ do_start ()
 		chown "${DAEMONUSER}":"${DAEMONUSER}" "${PIDDIR}"
 	fi
 
-	start-stop-daemon --start --quiet --pidfile "${PIDFILE}" \
-		--chuid "${DAEMONUSER}" --background --make-pidfile \
-		--exec "${DAEMON}" -- "${DAEMON_OPTS}"
+	start-stop-daemon --start --quiet --pidfile ${PIDFILE} \
+		--chuid ${DAEMONUSER} --background --make-pidfile \
+		--exec ${DAEMON} -- ${DAEMON_OPTS}
 }
 
 do_stop ()
 {
-	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --oknodo
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE} --oknodo
 }
 
 case "${1}" in
-- 
tryton-server