* fix debian scripts

* new version

diff --git a/citadel/debian/changelog b/citadel/debian/changelog
index a6e1b3aae8f2f426336e185ef1e742e1d5b81582..68a857e8123546885b1b47c510b3b0b1f4e4e012 100644 (file)
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,8 +1,9 @@
-citadel (7.38-40) stable; urgency=low
+citadel (7.38-41) stable; urgency=low
 
-  * new upstream version
+  * fix setup program
+  * several other tiny bugfixes.
 
- -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Thu, 11 Sep 2008 18:00:00 +0002
+ -- Wilfried Goesgens <w.goesgens@outgesourced.org>  Sun, 21 Sep 2008 18:00:00 +0002
 
 citadel (7.37-39) stable; urgency=low
 

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index 616f2104b1846b4d8af7d4e60dbe7dcc0a1bde84..f9120899d22e14caefdbdd614eaa9106aa92382d 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -27,7 +27,7 @@ case "$1" in
         fi
 
         export IP_ADDR=$ip_addr
-        export CITADEL=''
+        export CITADEL='/var/run/citadel'
        export CITADEL_PORT=504
         export CITADEL_INSTALLER=yes
        export CITADEL_UID=`grep citadel /etc/passwd | cut -d :  -f 3`
@@ -40,11 +40,12 @@ case "$1" in
 #This is not debian conformant, and uniq to the citadel.org debs.
        export ALTER_ETC_SERVICES=yes
 #
-        echo "applying your settings."
+        echo -n "applying your settings.... "
         /usr/lib/citadel-server/setup -q
-
+       echo "done"
         # we're in a fresh install, so we send the welcome message.
         if test -z "$2"; then
+           echo "migrating mail aliases from other mailers"
            /usr/lib/citadel-server/migrate_aliases.sh /etc/citadel/mail.aliases
            i=0;
            while test ! -S /var/run/citadel/lmtp.socket -a "$i" -lt "10"; do
@@ -52,6 +53,7 @@ case "$1" in
                i=$(($i + 1))
            done
            if test -S /var/run/citadel/lmtp.socket ; then
+               echo "sending welcome mail"
                export SEPERATOR=2600908b3f21ae7f692b973ed26e212d
                export WELCOMEHTML=/usr/share/doc/citadel-server/welcomemail.html
                export WELCOMETXT=/usr/share/doc/citadel-server/welcomemail.txt