* created common package.

diff --git a/citadel/debian/citadel-client.postinst b/citadel/debian/citadel-client.postinst
index 44ba62652a3ba063a79854eda57dbc26b47879ab..048eb65eb2a7da594e259100bf79c7f13f10d02a 100644 (file)
--- a/citadel/debian/citadel-client.postinst
+++ b/citadel/debian/citadel-client.postinst
@@ -5,17 +5,6 @@ set -e
 
 case "$1" in
     configure)
-        if ! getent group citadel >/dev/null; then 
-            groupadd citadel
-        fi
-
-        if ! getent passwd citadel >/dev/null; then 
-            adduser --system --ingroup citadel --home /var/lib/citadel \
-                    --gecos "Citadel system user" --shell /bin/sh \
-                    --disabled-password citadel
-        fi
-
-        mkdir -p /etc/citadel
         chown citadel:citadel /etc/citadel/citadel.rc
     ;;
 

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index 8307aaad75b3dd84d710a52f5800e417149706bb..17bbfa4e4dfc88ff28403538edcdd2b0d24c878b 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -9,16 +9,6 @@ db_version 2.0
 
 case "$1" in
     configure)
-        if ! getent group citadel >/dev/null; then 
-            groupadd citadel
-        fi
-
-        if ! getent passwd citadel >/dev/null; then 
-            adduser --system --ingroup citadel --home /var/lib/citadel \
-                    --gecos "Citadel system user" --shell /bin/sh \
-                    --disabled-password citadel
-        fi
-
         chown -R citadel:citadel /etc/citadel
         chown -R citadel:citadel /var/lib/citadel /var/spool/citadel
 

diff --git a/citadel/debian/control b/citadel/debian/control
index cbbfaa6d5609ab4870a2617ca59de3a50a626bea..89167c8e483864c315b41d3ab2304d544b2acccf 100644 (file)
--- a/citadel/debian/control
+++ b/citadel/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.7.2
 
 Package: citadel-server
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, citadel-common
 Recommends: db4.4-util | db4.3-util
 Suggests: citadel-mta
 Conflicts: pop3-server, imap-server
@@ -75,9 +75,22 @@ Description: complete and feature-rich groupware server
  .
   Homepage: http://www.citadel.org
 
+Package: citadel-common
+Architecture: all
+Description: complete and feature-rich groupware server
+ Citadel is a complete and feature-rich open source groupware platform.
+  * Email, calendaring/scheduling, address books
+  * Bulletin boards, mailing list server, instant messaging
+  * Multiple domain support
+  * An intuitive, attractive AJAX-style web interface
+ .
+ This package contains the common files.
+ .
+  Homepage: http://www.citadel.org
+
 Package: citadel-mta
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, citadel-server (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, citadel-server (= ${Source-Version}), citadel-common
 Conflicts: mail-transport-agent
 Provides: mail-transport-agent
 Replaces: mail-transport-agent
@@ -91,7 +104,7 @@ Description: complete and feature-rich groupware server (mail transport agent)
 
 Package: citadel-client
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, citadel-common
 Description: complete and feature-rich groupware server (command line client)
  This is package contains the command line client for Citadel, a complete and
  feature-rich open source groupware platform.