# 
# 
# patch "debian/monotone-server.config"
#  from [6df9a17931a643f2f9602f623361915ba6b65a66]
#    to [38136433339c76f732f01da4c21a0cad7a58a5d7]
# 
# patch "debian/monotone-server.install"
#  from [57e1d4a2e8dbb77279ed479b58141a62d8fa456f]
#    to [ffd47cdcf32ef9fb2d4493540cefd34430c15b44]
# 
# patch "debian/monotone-server.postinst"
#  from [ff507c133ed1cf6006eaa919b1b3560f8757fd1d]
#    to [4cfa9894b79e395db18a87967f04150f5eeff6bd]
# 
# patch "debian/monotone-server.postrm"
#  from [372f97a388c0b985572caf2fb5820cb1cfa41537]
#    to [983aace65f528eea48f7a8890a9146d0db5792b8]
# 
# patch "debian/monotone-server.templates"
#  from [ab74340c50f18d590fccdd810ec307070a3526b3]
#    to [6f83862f226fad9a45b5a82db41cca23371a479f]
# 
# patch "debian/po/templates.pot"
#  from [e79edfd6a012c7ebc9d8e1db9827fbee81a33626]
#    to [6da5d40b74b130b38cb4d4066f9057a8f5bc803a]
# 
============================================================
--- debian/monotone-server.config	6df9a17931a643f2f9602f623361915ba6b65a66
+++ debian/monotone-server.config	38136433339c76f732f01da4c21a0cad7a58a5d7
@@ -32,22 +32,19 @@
 case "$1" in
     configure)
         # set the default monotone keyname
-        db_set monotone-server/key `hostname --fqdn`
+        db_set monotone-server/key "address@hidden --fqdn`"
 
         db_input medium monotone-server/manage-db || true
         db_go || true
 
         # make sure we should manage things
-        db_get monotone_server/manage
+        db_get monotone-server/manage-db
         if [ "$RET" = false ]; then
             exit 0
         fi
 
-        db_input medium monotone-server/purge-db || true
-        db_go || true
-
         db_input low monotone-server/key || true
-        db_input medium monotone-server/passphrase || true
+        db_input low monotone-server/passphrase || true
         db_go || true
 
         # no passphrase was entered, generate one
============================================================
--- debian/monotone-server.install	57e1d4a2e8dbb77279ed479b58141a62d8fa456f
+++ debian/monotone-server.install	ffd47cdcf32ef9fb2d4493540cefd34430c15b44
@@ -1 +1 @@
-debian/examples debian/monotone-server/usr/share/doc/monotone-server/
+debian/examples usr/share/doc/monotone-server/
============================================================
--- debian/monotone-server.postinst	ff507c133ed1cf6006eaa919b1b3560f8757fd1d
+++ debian/monotone-server.postinst	4cfa9894b79e395db18a87967f04150f5eeff6bd
@@ -36,6 +36,17 @@
        
        # if this is our first install give config files correct permissions
        if [ -z "$2" ]; then
+           # create monotone user and fix permissions of files
+           if [ -z "`id -u monotone 2>/dev/null`" ]; then
+               /usr/sbin/adduser --system --group --home $MTN_HOME --no-create-home --disabled-password --quiet monotone --gecos "Monotone"
+               chown monotone:monotone $MTN_HOME
+               chown monotone:monotone $MTN_CONFDIR
+               chown monotone:monotone $MTN_KEYDIR
+               chmod 0750 $MTN_HOME
+               chmod 0750 $MTN_CONFDIR
+               chmod 0750 $MTN_KEYDIR
+           fi
+
            chown monotone:monotone /etc/monotone/write-permissions
            chown monotone:monotone /etc/monotone/read-permissions
            chown monotone:monotone /etc/monotone/hooks.lua
@@ -67,30 +78,21 @@
 
        if [ -z "$2" ]; then
           # not upgrading, fresh install
-          # create monotone user and fix permissions of files
-          if [ -z "`id -u monotone 2> /dev/null`" ]; then
-              /usr/sbin/adduser --system --group --home $MTN_HOME --no-create-home --disabled-password --quiet monotone --gecos "Monotone"
-              chown monotone:monotone $MTN_HOME
-              chown monotone:monotone $MTN_CONFDIR
-              chown monotone:monotone $MTN_KEYDIR
-              chmod 0750 $MTN_HOME
-              chmod 0750 $MTN_CONFDIR
-              chmod 0750 $MTN_KEYDIR
-          fi
 
           # if there is no database, create one
           if [ ! -e $MTN_DB ]; then
               echo "Creating Monotone database..." >&2
-              $MONOTONE --db $MTN_DB db init
+              $MONOTONE --db=$MTN_DB db init \
+                 --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR
               chmod 0600 $MTN_DB
               echo "Creating Monotone server keypair..." >&2
 
               yes "$MTN_KEY_PASSWD" | 
-                 $MONOTONE --db $MTN_DB genkey $MTN_KEY \
-                 --norc --keydir $MTN_KEYDIR --confdir $MTN_CONFDIR > /dev/null
+                 $MONOTONE --db=$MTN_DB genkey $MTN_KEY \
+                 --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR 2>/dev/null >/dev/null
 
-              $MONOTONE --db $MTN_DB pubkey $MTN_KEY \
-                 --norc --keydir $MTN_KEYDIR --confdir $MTN_CONFDIR > $MTN_HOME/$MTN_KEY.pubkey
+              $MONOTONE --db=$MTN_DB pubkey $MTN_KEY \
+                 --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR > $MTN_HOME/$MTN_KEY.pubkey
 
               echo "Monotone database created successfully." >&2
           fi
@@ -105,9 +107,8 @@
           echo "A backup named '`basename $MTN_DB~`' will be created in $MTN_HOME." >&2
 
           cp $MTN_DB $MTN_DB~
-          (yes "$MTN_KEY_PASSWD" |
-             $MONOTONE --db $MTN_DB db migrate \
-             --norc --keydir $MTN_KEYDIR --confdir $MTN_CONFDIR &&
+          ($MONOTONE --db=$MTN_DB db migrate \
+             --norc --keydir=$MTN_KEYDIR --confdir=$MTN_CONFDIR >&2 &&
              echo "Database successfully migrated." >&2) || 
           (echo "*** Error migrating database. ***" >&2 &&
               echo -e "Please see UPGRADE and README.changesets in /usr/share/doc/monotone for\n \
============================================================
--- debian/monotone-server.postrm	372f97a388c0b985572caf2fb5820cb1cfa41537
+++ debian/monotone-server.postrm	983aace65f528eea48f7a8890a9146d0db5792b8
@@ -38,20 +38,17 @@
        rm -f /etc/monotone/read-permissions || true
        rm -f /etc/monotone/hooks.lua || true
 
-       # remove database if debconf variable is set
-       db_get monotone-server/purge-db
-       if [ "$RET" = false ]; then
-           rm -f /etc/monotone/passphrases
-           DELUSER_FLAGS="--remove-home"
-           echo "deleting monotone database" >&2
+       if [ -n "`id -u monotone 2>/dev/null`" ]; then
+           /usr/sbin/deluser --quiet --remove-home monotone 2>/dev/null >/dev/null
        fi
 
-       /usr/sbin/deluser --quiet $DELUSER_FLAGS monotone
-       /usr/sbin/delgroup --quiet monotone
+       if [ -n "`id -g monotone 2>/dev/null`" ]; then
+           /usr/sbin/delgroup --quiet monotone 2>/dev/null >/dev/null
+       fi
+       
+       # delete the monotone database (only on purge)
+       rm -rf $MTN_HOME
 
-       echo "monotone user and group removed" >&2
-
-
     ;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;
============================================================
--- debian/monotone-server.templates	ab74340c50f18d590fccdd810ec307070a3526b3
+++ debian/monotone-server.templates	6f83862f226fad9a45b5a82db41cca23371a479f
@@ -17,9 +17,3 @@
  Please choose a passphrase for your monotone key. If left blank, one will
  be generated for you.
 
-Template: monotone-server/purge-db
-Type: boolean
-Default: false
-_Description: Delete monotone database when monotone-server is removed?
- If this option is selected, the monotone database and keys will be removed
- when the package is removed.
============================================================
--- debian/po/templates.pot	e79edfd6a012c7ebc9d8e1db9827fbee81a33626
+++ debian/po/templates.pot	6da5d40b74b130b38cb4d4066f9057a8f5bc803a
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-12-04 13:48-0600\n"
+"POT-Creation-Date: 2005-12-06 10:24-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -56,17 +56,3 @@
 "Please choose a passphrase for your monotone key. If left blank, one will be "
 "generated for you."
 msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../monotone-server.templates:23
-msgid "Delete monotone database when monotone-server is removed?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../monotone-server.templates:23
-msgid ""
-"If this option is selected, the monotone database and keys will be removed "
-"when the package is removed."
-msgstr ""