* Prepend our explicit warrant to link with openssl in the COPYING

* recommend shared-mime-info

diff --git a/citadel/COPYING b/citadel/COPYING
index 94a045322262546cfb9d72561e1d587b5c2ffb1e..3f304ded81f70d9a78327c96dcbbe0158865d13d 100644 (file)
--- a/citadel/COPYING
+++ b/citadel/COPYING
@@ -1,3 +1,18 @@
+
+* In addition, as a special exception, the copyright holders give
+* permission to link the code of portions of this program with the
+* OpenSSL library under certain conditions as described in each
+* individual source file, and distribute linked combinations
+* including the two.
+* You must obey the GNU General Public License in all respects
+* for all of the code used other than OpenSSL. If you modify
+* file(s) with this exception, you may extend this exception to your
+* version of the file(s), but you are not obligated to do so. If you
+* do not wish to do so, delete this exception statement from your
+* version. If you delete this exception statement from all source
+* files in the program, then also delete it here.
+
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 

diff --git a/citadel/debian/control b/citadel/debian/control
index e59ed5cb80a0de8c413b06df2ab50544bb71305f..63ccf0bb094c50be6c3b44ea74576b76d75ddc4f 100644 (file)
--- a/citadel/debian/control
+++ b/citadel/debian/control
@@ -10,7 +10,7 @@ Standards-Version: 3.7.3
 Package: citadel-server
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, citadel-common, openssl
-Recommends: db4.4-util | db4.3-util
+Recommends: db4.4-util | db4.3-util shared-mime-info
 Suggests: postfix | exim | citadel-mta | mail-transport-agent
 Conflicts: pop3-server, imap-server
 Provides: pop3-server, imap-server
@@ -166,6 +166,7 @@ Description: complete and feature-rich groupware server (mail transport agent)
 
 Package: citadel-client
 Architecture: any
+Recommends: shared-mime-info
 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