Bug#863996: unblock: citadel/902-4

[Michael Meskes <meskes@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package citadel

This upload fixes RC bug #862297. The Changelog says:

    Merge citadel-mta back into citadel-server because the citadel server
    assumes to be the mta unless manually told to not.
    (Closes: #862297)

git diff is attached.

Thanks

Michael

unblock citadel/902-4

-- System Information:
Debian Release: 9.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64
 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff --git a/debian/changelog b/debian/changelog
index b050044..4a73f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+citadel (902-4) unstable; urgency=medium
+
+  * Merge citadel-mta back into citadel-server because the citadel server
+    assumes to be the mta unless manually told to not.
+    (Closes: #862297)
+
+ -- Michael Meskes <meskes@debian.org>  Sun, 28 May 2017 20:53:40 +0200
+
 citadel (902-3) unstable; urgency=medium
 
   * Use SSL compability library.
diff --git a/debian/citadel-server.links b/debian/citadel-server.links
index 0a65bc2..c90e1af 100644
--- a/debian/citadel-server.links
+++ b/debian/citadel-server.links
@@ -1 +1,3 @@
 /usr/lib/citadel-server/sendcommand /usr/sbin/sendcommand 
+/usr/sbin/citmail /usr/sbin/sendmail
+/usr/share/man/man1/citmail.1.gz /usr/share/man/man1/sendmail.1.gz
diff --git a/debian/citadel-server.manpages b/debian/citadel-server.manpages
index b647887..1d7652d 100644
--- a/debian/citadel-server.manpages
+++ b/debian/citadel-server.manpages
@@ -1,2 +1,3 @@
 debian/manpages/citserver.8
 debian/manpages/sendcommand.8
+debian/manpages/citmail.1
diff --git a/debian/control b/debian/control
index c65f78a..bd2753f 100644
--- a/debian/control
+++ b/debian/control
@@ -16,10 +16,9 @@ Package: citadel-server
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, openssl, patch, lsb-base (>= 3.0-6)
 Recommends: db4.6-util, shared-mime-info
-Suggests: postfix | exim4 | citadel-mta | mail-transport-agent
-Replaces: citadel-mta, citadel-common
-Conflicts: pop3-server, imap-server, citadel-common
-Provides: pop3-server, imap-server
+Replaces: citadel-mta, citadel-common, mail-transport-agent
+Conflicts: pop3-server, imap-server, citadel-common, mail-transport-agent, citadel-mta
+Provides: pop3-server, imap-server, mail-transport-agent, citadel-mta
 Description: complete and feature-rich groupware server
  Citadel is a complete and feature-rich open source groupware platform.
   * Email, calendaring/scheduling, address books
@@ -36,18 +35,6 @@ Description: complete and feature-rich groupware server
  support a large number of concurrent users, but you can also build
  a distributed network of Citadel nodes that share rooms and their content.
 
-Package: citadel-mta
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, citadel-server (>= 7.50)
-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.
- .
- See the 'citadel-server' package for more information.
-
 Package: citadel-doc
 Section: doc
 Architecture: all