# 
# 
# patch "contrib/monotone.bash_completion"
#  from [52d93bb9bd75fc7d6f946488e16968452e6d8622]
#    to [c5fff50c3c591f9dd72f80c3812c506571e3ab74]
# 
# patch "debian/monotone-server.monotone.init"
#  from [2db33db14fec94a962edd1abf0d8ec3960e7848d]
#    to [7d84eb26641e0e5a7c4399bd886c5150c026fde4]
# 
============================================================
--- contrib/monotone.bash_completion	52d93bb9bd75fc7d6f946488e16968452e6d8622
+++ contrib/monotone.bash_completion	c5fff50c3c591f9dd72f80c3812c506571e3ab74
@@ -1,8 +1,9 @@
 # -*- shell-script -*-
 # vim: set ft=sh:
 
-# bash completion for monotone 0.18
+# bash completion for monotone 0.25
 # Author: Olivier Andrieu <address@hidden>
+# Contributions by Matthew A. Nicholson <address@hidden>
 
 # source this file from your .bashrc
 # If you use the bash completion package <http://www.caliban.org/bash/>,
============================================================
--- debian/monotone-server.monotone.init	2db33db14fec94a962edd1abf0d8ec3960e7848d
+++ debian/monotone-server.monotone.init	7d84eb26641e0e5a7c4399bd886c5150c026fde4
@@ -46,9 +46,9 @@
           return 0
        fi
 
-       start-stop-daemon --start --quiet --make-pidfile --pidfile $PIDFILE \
+       start-stop-daemon --start --quiet --pidfile $PIDFILE \
                --exec $DAEMON --chuid monotone --chdir $MTN_HOME -- \
-	       --confdir=$MTN_CONFDIR --db=$DB --norc \
+	       --confdir=$MTN_CONFDIR --db=$DB --norc --pid-file=$PIDFILE \
 	       --rcfile=$MTN_CONFDIR/hooks.lua --keydir=$MTN_KEYDIR \
                --bind=$ADDRESS serve $BRANCHES >> /var/log/monotone.log 2>&1 &