# 
# 
# patch "ChangeLog"
#  from [a0b0c1e0984107ebeda0a07921ece921ac16406a]
#    to [c2699d481b8a6645185f63db9ba000238c67f0a9]
# 
# patch "debian/monotone-server.monotone.init"
#  from [cb1c25d474a6fc19fbc6a07d3234a9a96a2564be]
#    to [078ef6bc30e1d2cd26c5d723b3cd37281ee0db1c]
# 
============================================================
--- ChangeLog	a0b0c1e0984107ebeda0a07921ece921ac16406a
+++ ChangeLog	c2699d481b8a6645185f63db9ba000238c67f0a9
@@ -1,3 +1,7 @@
+2006-03-31  Matthew Nicholson  <address@hidden>
+
+	* debian/monotone-server.monotone.init: Fix pidfile saving.
+
 2006-03-30  Nathaniel Smith  <address@hidden>
 
 	* testsuite.at: Ah-hah, missed AT_TESTED.  Should fix the
============================================================
--- debian/monotone-server.monotone.init	cb1c25d474a6fc19fbc6a07d3234a9a96a2564be
+++ debian/monotone-server.monotone.init	078ef6bc30e1d2cd26c5d723b3cd37281ee0db1c
@@ -20,8 +20,9 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DESC="Monotone Server"
 NAME=monotone
+EXECNAME=mtn
 DAEMON=/usr/bin/mtn
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/run/$EXECNAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 MTN_HOME=/var/lib/monotone
@@ -46,9 +47,9 @@
           return 0
        fi
 
-       start-stop-daemon --start --quiet --pidfile $PIDFILE \
+       start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
                --exec $DAEMON --chuid monotone --chdir $MTN_HOME -- \
-	       --confdir=$MTN_CONFDIR --db=$DB --norc --pid-file=$PIDFILE \
+	       --confdir=$MTN_CONFDIR --db=$DB --norc \
 	       --rcfile=$MTN_CONFDIR/hooks.lua --keydir=$MTN_KEYDIR \
                --bind=$ADDRESS serve $BRANCHES >> /var/log/monotone.log 2>&1 &
 
@@ -59,7 +60,7 @@
 #
 d_stop() {
        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-               --name $NAME --user monotone
+               --name $EXECNAME --user monotone
        
 
 #       kill `ps x | grep monotone.*serve | grep -v grep | awk -- '{print $1}'` &> /dev/null \