[tryton-debian-vcs] tryton-server branch debian-jessie-3.4 updated. debian/3.4.6-2-3-g49a44f9

[Mathias Behrle]

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

commit 49a44f91818a6ab90209cfe1b09d35ff97cc8b66
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 27 10:56:48 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 935bc12..678768f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-server (3.4.6-3) unstable; urgency=medium
+
+  * 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:56:29 +0100
+
 tryton-server (3.4.6-2) unstable; urgency=medium
 
   * Running internal cron of trytond by default.
commit 9b44db72968d29d572b5a07364bfe6891cfcdc5d
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.
    
    (cherry picked from commit bcff681096191e27f11615c959916d280bd35182)

diff --git a/debian/tryton-server.init b/debian/tryton-server.init
index bf17039..51813d9 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 c37e663c03ef446e4668296aa698a7b43411c1e1
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.
    
    (cherry picked from commit e988f1e58db8f94e38e427d6efaef30f2a2e3ef7)

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"
-- 
tryton-server