* more debian build added.

diff --git a/citadel/debian/citadel-server.dirs b/citadel/debian/citadel-server.dirs
index d87069e820bdda3bdb36067d1ae361029c76753a..14eb891f524f6cc6442a74df54f047e0ba178320 100644 (file)
--- a/citadel/debian/citadel-server.dirs
+++ b/citadel/debian/citadel-server.dirs
@@ -1,16 +1,13 @@
-usr/sbin
-usr/share/doc
+etc/citadel/help
+etc/citadel/messages
 usr/share/doc/citadel-server
-var/lib/citadel/data
 var/lib/citadel/bio
 var/lib/citadel/bitbucket
+var/lib/citadel/data
 var/lib/citadel/files
 var/lib/citadel/images
 var/lib/citadel/info
 var/lib/citadel/userpics
-var/run/citadel/
+var/run/citadel
 var/spool/citadel/network/spoolin
 var/spool/citadel/network/spoolout
-etc/citadel
-etc/citadel/help
-etc/citadel/messages

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index ac5aa2d07021dbaa1f04253afbd84b0a24d789d9..1948720afdf7c1ad198898ad7c2cd8270726bba2 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -7,6 +7,7 @@ set -e
 # Use debconf.
 . /usr/share/debconf/confmodule
 
+db_version 2.0
 
 case "$1" in
   configure)
@@ -18,11 +19,10 @@ case "$1" in
                        --gecos "Citadel system user" --shell /bin/sh \
                        --disabled-password citadel
        fi
-       mkdir -p /etc/citadel
-       chown citadel:citadel /etc/citadel
-
+       chown -R citadel:citadel /etc/citadel
        chown -R citadel:citadel /var/lib/citadel /var/spool/citadel
 
+# we're a bit paranoid here, because of this gave us many errors in the past.
         chown root:root /usr/sbin/chkpwd
         chmod 4755 /usr/sbin/chkpwd
 

diff --git a/citadel/debian/citadel-server.postrm b/citadel/debian/citadel-server.postrm
index 8c40fefd3189de7b44c649a13807c6c8ffb1c8d6..7e196ceff8e457f1e1b3d1874ffdccd09cecd974 100644 (file)
--- a/citadel/debian/citadel-server.postrm
+++ b/citadel/debian/citadel-server.postrm
@@ -1,7 +1,5 @@
 #! /bin/sh
-. /usr/share/debconf/confmodule
 set -e
-
 . /usr/share/debconf/confmodule
 db_version 2.0
 
@@ -9,9 +7,6 @@ case "$1" in
   remove)
     ;;
   purge)
-       rmdir "/etc/citadel/help"
-       rmdir "/etc/citadel/messages"
-
        echo "/var/lib/citadel/data not removed, as it may contain your personal data."
        db_purge
        db_go

diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init
index 5a5b0be3c6d04a10e7902dfc8e2cff3196ad7ea7..40610d8f6172014b30d28ca63eeef5e8b318dd85 100644 (file)
--- a/citadel/debian/citadel.init
+++ b/citadel/debian/citadel.init
@@ -161,4 +161,4 @@ case "$1" in
        ;;
 esac
 
-:
+exit 0
\ No newline at end of file

diff --git a/citadel/debian/control b/citadel/debian/control
index c4d8c5a455cb6d94b9e011ded9ae99a93bbebe86..dde77c56ccc043f0d42c4621923474e4d97e7425 100644 (file)
--- a/citadel/debian/control
+++ b/citadel/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2.2
 
 Package: citadel-server
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser 
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
 Recommends: db4.4-util | db4.3-util
 Suggests: citadel-mta
 Conflicts: pop3-server, imap-server
@@ -77,14 +77,13 @@ Description: complete and feature-rich groupware server
 
 Package: citadel-mta
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, citadel-server 
+Depends: ${shlibs:Depends}, ${misc:Depends}, citadel-server (= ${Source-Version})
 Conflicts: mail-transport-agent
 Provides: mail-transport-agent
+Replaces: mail-transport-agent
 Description: complete and feature-rich groupware server (mail transport agent)
  This package contains the mail transport agent component for Citadel,
  a complete and feature-rich open source groupware platform.
- If you want to use citadel in conjunction with another MTA system, don't 
- install this package.
  .
  See the 'citadel-server' package for more informations.
  .

diff --git a/citadel/debian/rules b/citadel/debian/rules
index 1d15f6e169190ef03c090c9998e1deccf4c6f0ad..9e31aa107590211a9d99d529dadedc1953efd5a6 100755 (executable)
--- a/citadel/debian/rules
+++ b/citadel/debian/rules
@@ -69,19 +69,14 @@ install-arch:
        dh_clean -k -s 
        dh_installdirs -s
        $(MAKE) DESTDIR=$(DEB_DESTDIR) install-exec-new install-data-new
-
-
        mkdir -p $(DEB_DESTDIR)/usr/lib/citadel-server
        mv $(DEB_DESTDIR)/usr/sbin/setup \
-          $(DEB_DESTDIR)/usr/lib/citadel-server/
-       cp $(DEB_DESTDIR)/usr/sbin/citmail \
-          $(DEB_DESTDIR)/usr/sbin/sendmail
-
+               $(DEB_DESTDIR)/usr/lib/citadel-server/
        mkdir -p $(DEB_DESTDIR)/usr/share/doc/citadel-server/
-        mv $(DEB_DESTDIR)/usr/share/doc/citadel-doc/database_cleanup.sh \
-                $(DEB_DESTDIR)/usr/share/doc/citadel-server/
+       mv $(DEB_DESTDIR)/usr/share/doc/citadel-doc/database_cleanup.sh \
+               $(DEB_DESTDIR)/usr/share/doc/citadel-server/
 
-        dh_install -s --sourcedir=debian/tmp
+       dh_install -s --sourcedir=debian/tmp
 
 binary-common:
        dh_testdir