# 
# 
# patch "ChangeLog"
#  from [8a14e62bcbc83773fbb48157909474f20f75291e]
#    to [5f8f3954c40358b385b7ea0817cb9342367bc854]
# 
# patch "debian/NEWS"
#  from [3ce4f7b180b5ea6ef694d79490bf3a452ba539be]
#    to [c65b0966fcc80631dd6202c6831e6a58a614f77d]
# 
# patch "debian/changelog"
#  from [fffcef90a91c00dcb711d28c546005c20bb7ab07]
#    to [23f0f277d08df500e8e729238e560e39cc63cd94]
# 
# patch "debian/monotone-server.monotone.init"
#  from [ffba21db2ca4ff6f48297e88f0b2bd0a835ed575]
#    to [d852cc0f4ba3cc0ef19f67892fe3454139b27747]
# 
============================================================
--- ChangeLog	8a14e62bcbc83773fbb48157909474f20f75291e
+++ ChangeLog	5f8f3954c40358b385b7ea0817cb9342367bc854
@@ -1,3 +1,13 @@
+2006-11-18  Richard Levitte  <address@hidden>
+
+	* debian/monotone-server.monotone.init (d_start): Remove the
+	branch argument, which was all-inklusive anyway.
+	* debian/changelog: Mark a new version to make it possible to
+	write a ...
+	* debian/NEWS: New news item indicating to Debian users that
+	they may need to do some changes if they want their servers
+	to still run.
+
 2006-11-18  Timtohy Brownawell  <address@hidden>
 
 	Make 'serve' always serve everything, and no longer take
============================================================
--- debian/NEWS	3ce4f7b180b5ea6ef694d79490bf3a452ba539be
+++ debian/NEWS	c65b0966fcc80631dd6202c6831e6a58a614f77d
@@ -1,3 +1,15 @@
+monotone (0.31-90.2) unstable; urgency=low
+
+  * "mtn serve" doesn't take any mandatory arguments any more.  Instead
+    of specifying branches to serve (or to exclude) on the command line,
+    mtn now entirely trusts the netsync permission hooks called
+    get_netsync_read_permitted and get_netsync_write_permitted.
+
+    If you have any "mtn serve" still running with branches given on the
+    command line, you will need to remove those and work on the hooks.
+    If you just have the argument "*", it can safely be removed.  Not
+    doing so will cause your server to stop working.
+
 monotone (0.31-90.1) unstable; urgency=low
 
   * Another efficiency change.  You need to do the following on each
============================================================
--- debian/changelog	fffcef90a91c00dcb711d28c546005c20bb7ab07
+++ debian/changelog	23f0f277d08df500e8e729238e560e39cc63cd94
@@ -1,3 +1,10 @@
+monotone (0.31-90.2) unstable; urgency=low
+
+  * Another pre-0.32 "release", just to mark that an important behavior
+    change has been made to the "mtn serve" command.
+
+ -- Richard Levitte <address@hidden>  Sat, 18 Nov 2006 22:25:11 +0100
+
 monotone (0.31-90.1) unstable; urgency=low
 
   * Pre-0.32 "release", serving as a marker for a new infrastructure which
============================================================
--- debian/monotone-server.monotone.init	ffba21db2ca4ff6f48297e88f0b2bd0a835ed575
+++ debian/monotone-server.monotone.init	d852cc0f4ba3cc0ef19f67892fe3454139b27747
@@ -58,8 +58,7 @@ d_start() {
           --confdir=$MTN_CONFDIR --db=$MTN_DB --norc --pid-file=$PIDFILE \
           --log=$MAINLOG --dump=$ERRORLOG \
           --rcfile=$MTN_CONFDIR/hooks.lua --keydir=$MTN_KEYDIR --quiet \
-          --bind=$ADDRESS serve "*"
-
+          --bind=$ADDRESS serve
 }
 
 #