# 
# 
# patch "ChangeLog"
#  from [45fe5d1cb41345291e7e7e566072727882ec9277]
#    to [3b275e8663ce8601acfbf7d9c1ff4ab874e9bb33]
# 
# patch "debian/monotone-server.postinst"
#  from [69ca5ca157be466099f3ee3bd81f5fb7a85a7acb]
#    to [faccbe27e0d57edd8391130c7105e3035b833909]
# 
============================================================
--- ChangeLog	45fe5d1cb41345291e7e7e566072727882ec9277
+++ ChangeLog	3b275e8663ce8601acfbf7d9c1ff4ab874e9bb33
@@ -1,3 +1,8 @@
+2006-04-30  Matthew Nicholson  <address@hidden>
+
+	* debian/monotone-server.postinst: Change $MONOTONE to $MTN.  Added
+	--quite flag to key generation.
+
 2006-04-18  Richard Levitte  <address@hidden>
 
 	This change was contributed by Shaun Jackman <address@hidden>
============================================================
--- debian/monotone-server.postinst	69ca5ca157be466099f3ee3bd81f5fb7a85a7acb
+++ debian/monotone-server.postinst	faccbe27e0d57edd8391130c7105e3035b833909
@@ -23,7 +23,7 @@
 # source debconf stuff
 . /usr/share/debconf/confmodule
 
-MONOTONE=/usr/bin/mtn
+MTN=/usr/bin/mtn
 
 case "$1" in
     configure)
@@ -88,7 +88,7 @@
               # if there is no database, create one
               if [ ! -e $MTN_DB ]; then
                   echo "Creating Monotone database..." >&2
-                  $MONOTONE --db=$MTN_DB db init \
+                  $MTN --db=$MTN_DB db init \
                      --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR
 
                   chmod 0600 $MTN_DB
@@ -97,14 +97,11 @@
                   echo "Creating Monotone server keypair..." >&2
 
                   yes "$MTN_KEY_PASSWD" | 
-                     $MONOTONE --db=$MTN_DB genkey $MTN_KEY \
-                     --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR 2>/dev/null >/dev/null
+                     $MTN --db=$MTN_DB genkey $MTN_KEY --quiet \
+                     --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR
                   
                   chown monotone:monotone $MTN_HOME/keys/*
 
-                  $MONOTONE --db=$MTN_DB pubkey $MTN_KEY --rcfile=$MTN_CONFDIR/hooks.lua \
-                     --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR > $MTN_HOME/$MTN_KEY.pubkey
-
                   echo "Monotone database created successfully." >&2
               fi
            elif dpkg --compare-versions "$MTN_VERSION" lt "0.17"; then 
@@ -121,7 +118,7 @@
               cp $MTN_DB $MTN_DB~
 
               set +e
-              $MONOTONE --db=$MTN_DB db migrate --rcfile=$MTN_CONFDIR/hooks.lua \
+              $MTN --db=$MTN_DB db migrate --rcfile=$MTN_CONFDIR/hooks.lua \
                  --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR >&2
 
               # make sure the migration was successful
@@ -130,7 +127,7 @@
 
                  # now we need to rosterify
                  echo "Attempting to rosterify monotone database..." >&2
-                 $MONOTONE --db=$MTN_DB db rosterify --rcfile=$MTN_CONFDIR/hooks.lua \
+                 $MTN --db=$MTN_DB db rosterify --rcfile=$MTN_CONFDIR/hooks.lua \
                     --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR >&2
 
                  # check for errors