# 
# 
# patch "ChangeLog"
#  from [c2699d481b8a6645185f63db9ba000238c67f0a9]
#    to [b9a198e7e00766b886a46cd84e061aa588a76ed4]
# 
# patch "debian/monotone-server.dirs"
#  from [56cce4b0d51698cab1f729f8caab53d660fb1315]
#    to [03976bb511b4f98e04b46ba38be3cd756a4cfd00]
# 
# patch "debian/monotone-server.monotone.init"
#  from [078ef6bc30e1d2cd26c5d723b3cd37281ee0db1c]
#    to [2bf4f481d3a3899d3883007dbd27ae443e7f7277]
# 
# patch "debian/monotone-server.postinst"
#  from [b8b5f2ccef0ccfdf9c460e8f32e6034e470afe6a]
#    to [e307a0e265ad5830eb9d3a6dbb9997e27090d7e9]
# 
============================================================
--- ChangeLog	c2699d481b8a6645185f63db9ba000238c67f0a9
+++ ChangeLog	b9a198e7e00766b886a46cd84e061aa588a76ed4
@@ -1,3 +1,12 @@
+2006-04-01  Matthew Nicholson  <address@hidden>
+
+	* debian/monotone-server.dirs: Added new /var/log/monotone and
+	/var/run/monotone directories.
+	* debian/monotone-server.postinst: Set ownership and on new
+	directories.
+	* debian/monotone-server.monotone.init: Modified to use new log and
+	pid file locations and new --log option.
+
 2006-03-31  Matthew Nicholson  <address@hidden>
 
 	* debian/monotone-server.monotone.init: Fix pidfile saving.
============================================================
--- debian/monotone-server.dirs	56cce4b0d51698cab1f729f8caab53d660fb1315
+++ debian/monotone-server.dirs	03976bb511b4f98e04b46ba38be3cd756a4cfd00
@@ -1,3 +1,5 @@
 var/lib/monotone
 var/lib/monotone/keys
 etc/monotone
+var/log/monotone
+var/run/monotone
============================================================
--- debian/monotone-server.monotone.init	078ef6bc30e1d2cd26c5d723b3cd37281ee0db1c
+++ debian/monotone-server.monotone.init	2bf4f481d3a3899d3883007dbd27ae443e7f7277
@@ -21,8 +21,8 @@
 DESC="Monotone Server"
 NAME=monotone
 EXECNAME=mtn
-DAEMON=/usr/bin/mtn
-PIDFILE=/var/run/$EXECNAME.pid
+DAEMON=/usr/bin/$EXECNAME
+PIDFILE=/var/run/$NAME/$EXECNAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 MTN_HOME=/var/lib/monotone
@@ -47,11 +47,12 @@
           return 0
        fi
 
-       start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
-               --exec $DAEMON --chuid monotone --chdir $MTN_HOME -- \
-	       --confdir=$MTN_CONFDIR --db=$DB --norc \
-	       --rcfile=$MTN_CONFDIR/hooks.lua --keydir=$MTN_KEYDIR \
-               --bind=$ADDRESS serve $BRANCHES >> /var/log/monotone.log 2>&1 &
+       start-stop-daemon --start --quiet --pidfile $PIDFILE --background \
+          --exec $DAEMON --chuid monotone --chdir $MTN_HOME -- \
+          --confdir=$MTN_CONFDIR --db=$DB --norc --pid-file=$PIDFILE \
+          --log=/var/log/$NAME/$EXECNAME.log --dump=/var/log/$NAME/error.log \
+          --rcfile=$MTN_CONFDIR/hooks.lua --keydir=$MTN_KEYDIR --quiet \
+          --bind=$ADDRESS serve $BRANCHES 
 
 }
 
============================================================
--- debian/monotone-server.postinst	b8b5f2ccef0ccfdf9c460e8f32e6034e470afe6a
+++ debian/monotone-server.postinst	e307a0e265ad5830eb9d3a6dbb9997e27090d7e9
@@ -32,7 +32,7 @@
        MTN_DB=$MTN_HOME/default.mtn
        MTN_CONFDIR=/etc/monotone
        MTN_KEYDIR=$MTN_HOME/keys
-
+	       
        /usr/bin/ucf --debconf-ok /usr/share/doc/monotone-server/examples/write-permissions /etc/monotone/write-permissions
        /usr/bin/ucf --debconf-ok /usr/share/doc/monotone-server/examples/read-permissions /etc/monotone/read-permissions
        /usr/bin/ucf --debconf-ok /usr/share/doc/monotone-server/examples/hooks.lua /etc/monotone/hooks.lua
@@ -48,6 +48,8 @@
 	       chown monotone:monotone $MTN_HOME
                chown monotone:monotone $MTN_CONFDIR
                chown monotone:monotone $MTN_KEYDIR
+               chown monotone:monotone /var/log/monotone
+               chown monotone:monotone /var/run/monotone
 
                chmod 0750 $MTN_HOME
                chmod 0750 $MTN_CONFDIR