# 
# 
# patch "debian/monotone-server.monotone.default"
#  from [920f2a6f1e6f5dc1833c6f8470db2327d79f3936]
#    to [cc878bb238be3a201b688a57f4582e51a3f77238]
# 
# patch "debian/monotone-server.monotone.init"
#  from [c29734464885597a7bd8589294e44d8202793adf]
#    to [c26896274c03e65144465faede5cd36fa9c9512e]
# 
============================================================
--- debian/monotone-server.monotone.default	920f2a6f1e6f5dc1833c6f8470db2327d79f3936
+++ debian/monotone-server.monotone.default	cc878bb238be3a201b688a57f4582e51a3f77238
@@ -10,8 +10,8 @@
 DB=/var/lib/monotone/default.db
 
 # Branches that monotone should serve (seperated by white space)
-BRANCHES='com.domain.*
-          com.domain.branch
-          domain.com/*
-          domain.com/branch'
+BRANCHES='tld.domain.*
+          tld.domain.branch
+          domain.tld/*
+          domain.tld/branch'
 
============================================================
--- debian/monotone-server.monotone.init	c29734464885597a7bd8589294e44d8202793adf
+++ debian/monotone-server.monotone.init	c26896274c03e65144465faede5cd36fa9c9512e
@@ -44,7 +44,8 @@
 
        start-stop-daemon --start --quiet --make-pidfile --pidfile $PIDFILE \
                --exec $DAEMON --chuid monotone --chdir /var/lib/monotone -- \
-	       --db=$DB --norc --rcfile=/etc/monotone/hooks.lua serve \
+	       --confdir=/etc/monotone --db=$DB --norc \
+	       --rcfile=/etc/monotone/hooks.lua serve \
                $ADDRESS $BRANCHES >> /var/log/monotone.log 2>&1 &
 
 }