# # # patch "debian/monotone-server.monotone.init" # from [f4e8292bc93bd5d337b33b5afd50b882cdffb2c1] # to [9f48d171429a426c81b4989dd74f5b14cdb0c13f] # # patch "debian/monotone-server.postinst" # from [1dfae8b57d9ea82b6ec9191296445b1db30854bd] # to [ff507c133ed1cf6006eaa919b1b3560f8757fd1d] # ============================================================ --- debian/monotone-server.monotone.init f4e8292bc93bd5d337b33b5afd50b882cdffb2c1 +++ debian/monotone-server.monotone.init 9f48d171429a426c81b4989dd74f5b14cdb0c13f @@ -50,7 +50,7 @@ --exec $DAEMON --chuid monotone --chdir $MTN_HOME -- \ --confdir=$MTN_CONFDIR --db=$DB --norc \ --rcfile=$MTN_CONFDIR/hooks.lua --keydir=$MTN_KEYDIR \ - --bind $ADDRESS serve $BRANCHES >> /var/log/monotone.log 2>&1 & + --bind=$ADDRESS serve $BRANCHES >> /var/log/monotone.log 2>&1 & } ============================================================ --- debian/monotone-server.postinst 1dfae8b57d9ea82b6ec9191296445b1db30854bd +++ debian/monotone-server.postinst ff507c133ed1cf6006eaa919b1b3560f8757fd1d @@ -25,8 +25,8 @@ case "$1" in configure) - MTN_DB=/var/lib/monotone/default.db MTN_HOME=/var/lib/monotone + MTN_DB=$MTN_HOME/default.db MTN_CONFDIR=/etc/monotone MTN_KEYDIR=$MTN_HOME/keys @@ -102,7 +102,7 @@ elif [ dpkg --compare-versions "$MTN_VERSION" lt 0.22 ]; then # upgradable version of monotone echo "Attempting to migrate monotone database..." >&2 - echo "A backup will be created in $MTN_HOME." >&2 + echo "A backup named '`basename $MTN_DB~`' will be created in $MTN_HOME." >&2 cp $MTN_DB $MTN_DB~ (yes "$MTN_KEY_PASSWD" |