# 
# 
# patch "ChangeLog"
#  from [bd6d77898ea6d818d56e63dc71adff285d6d2efc]
#    to [8373cfe61b7602d44852e117614932d9bade066e]
# 
# patch "debian/monotone-server.monotone.init"
#  from [2bf4f481d3a3899d3883007dbd27ae443e7f7277]
#    to [d49eb4c1ce43fcbb28b640a307f4ecfe76f52328]
# 
============================================================
--- ChangeLog	bd6d77898ea6d818d56e63dc71adff285d6d2efc
+++ ChangeLog	8373cfe61b7602d44852e117614932d9bade066e
@@ -1,5 +1,10 @@
 2006-04-02  Matthew Nicholson  <address@hidden>
 	
+	* debian/monotone-server.monotone.init: Clean up monotone's pid file
+	for it.  The is a temporary work around until monotone learns to clean
+
+2006-04-02  Matthew Nicholson  <address@hidden>
+	
 	* debian/monotone-server.TODO.Debian: Added.
 
 2006-04-02  Matthew Nicholson  <address@hidden>
============================================================
--- debian/monotone-server.monotone.init	2bf4f481d3a3899d3883007dbd27ae443e7f7277
+++ debian/monotone-server.monotone.init	d49eb4c1ce43fcbb28b640a307f4ecfe76f52328
@@ -24,6 +24,8 @@
 DAEMON=/usr/bin/$EXECNAME
 PIDFILE=/var/run/$NAME/$EXECNAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
+MAINLOG=/var/log/$NAME/$EXECNAME.log
+ERRORLOG=/var/log/$NAME/error.log
 
 MTN_HOME=/var/lib/monotone
 MTN_CONFDIR=/etc/monotone
@@ -50,7 +52,7 @@
        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 \
+          --log=$MAINLOG --dump=$ERRORLOG \
           --rcfile=$MTN_CONFDIR/hooks.lua --keydir=$MTN_KEYDIR --quiet \
           --bind=$ADDRESS serve $BRANCHES 
 
@@ -61,7 +63,8 @@
 #
 d_stop() {
        start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-               --name $EXECNAME --user monotone
+               --name $EXECNAME --user monotone \
+          && rm $PIDFILE
        
 
 #       kill `ps x | grep monotone.*serve | grep -v grep | awk -- '{print $1}'` &> /dev/null \