[pkg-kolab] r283 - branches/cyrus_minimizing+merging/debian

[Steffen Joeris]

Author: white-guest
Date: 2006-02-08 11:34:48 +0000 (Wed, 08 Feb 2006)
New Revision: 283

Modified:
   branches/cyrus_minimizing+merging/debian/changelog
   branches/cyrus_minimizing+merging/debian/control
Log:
* merge changes back :(


Modified: branches/cyrus_minimizing+merging/debian/changelog
===================================================================
--- branches/cyrus_minimizing+merging/debian/changelog	2006-02-08 11:28:46 UTC (rev 282)
+++ branches/cyrus_minimizing+merging/debian/changelog	2006-02-08 11:34:48 UTC (rev 283)
@@ -1,4 +1,4 @@
-kolab-cyrus-imapd (2.2.12-1) experimental; urgency=low
+kolab-cyrus-imapd (2.2.12-1rc1) experimental; urgency=low
 
   * Build for kolab, based on packaging from cyrus22
     special thanks to cyrus-maintainers
@@ -14,8 +14,8 @@
      ( 100-kolab-imapd, 105-cyradm.sh, 110-Admin.pm, 120-kolab-Shell.pm,
        130-kolab-imapd-goodchars, 140-kolab-ldap, 150-kolab-auth_unix)
    * remove -doc package, because we can use the cyrus22-doc package
-   * drop -nntp, -admin, -murder and -clients because there is no need 
-     for them with kolab
+   * remove -dev package because we don't need it
+   * drop nntp because there is no need for it with kolab
    * remove various README files, because they only belong to the
      cyrus22 package
    * wrote README.Debian
@@ -23,11 +23,12 @@
    * change various pathes to make kolab- packages
    * change pathes in scripts to make it kolab compatible
 
-   [ Noel Koethe ]
+   [ Noèl Köthe ]
 
-   * change configuration in conffiles
+   * change configurations
+   * build r261 as package
 
- -- Steffen Joeris <steffen.joeris at skolelinux.de>  Tue,  24 Jan 2006 13:53:51 +0000
+ -- Noèl Köthe <noel at debian.org>  Wed, 01 Feb 2006 11:54:53 +0100
 
 cyrus22-imapd (2.2.12-1) experimental; urgency=low
 

Modified: branches/cyrus_minimizing+merging/debian/control
===================================================================
--- branches/cyrus_minimizing+merging/debian/control	2006-02-08 11:28:46 UTC (rev 282)
+++ branches/cyrus_minimizing+merging/debian/control	2006-02-08 11:34:48 UTC (rev 283)
@@ -2,8 +2,8 @@
 Section: mail
 Priority: extra
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
-Uploaders: Noèl Köthe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>
-Build-Depends: debhelper (>= 4.1.0), libldap2-dev, tcl8.3-dev, libwrap0-dev, libpam0g-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, libsensors-dev, libdb4.2-dev, dpatch
+Uploaders: Noel Koethe <noel at debian.org>, Steffen Joeris <steffen.joeris at skolelinux.de>
+Build-Depends: debhelper (>= 4.1.0), tcl8.3-dev, libwrap0-dev, libpam0g-dev, libssl-dev, libzephyr-dev, libsasl2-dev (>= 2.1.9), comerr-dev, drac-dev (>= 1.11-7), libsnmp9-dev | libsnmp5-dev, perl (>= 5.6.0-16), xutils, flex, bison, autotools-dev, po-debconf, libsensors-dev, libdb4.2-dev, dpatch, libldap2-dev
 Build-Depends-Indep: transfig, gs, groff
 Standards-Version: 3.6.2
 
@@ -11,7 +11,7 @@
 Architecture: any
 Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Replaces: cyrus21-common
-Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus22-common, cyrus21-common
+Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus-common-2.2, cyrus21-common
 Description: Cyrus mail system (common files)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -40,7 +40,7 @@
 Architecture: any
 Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
 Replaces: cyrus21-imapd
-Conflicts: imap-server, cyrus21-imapd
+Conflicts: imap-server, cyrus21-imapd, cyrus-imapd-2.2
 Description: Cyrus mail system (IMAP support)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -68,7 +68,7 @@
 Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
 Provides: pop3-server
 Replaces: cyrus21-pop3d
-Conflicts: pop3-server, cyrus21-pop3d
+Conflicts: pop3-server, cyrus21-pop3d, cyrus-pop3d-2.2
 Description: Cyrus mail system (POP3 support)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -95,7 +95,7 @@
 Depends: kolab-libcyrus-imap-perl (>= ${Source-Version})
 Suggests: sasl2-bin
 Replaces: cyrus21-admin
-Conflicts: cyrus-admin, cyrus21-admin
+Conflicts: cyrus-admin, cyrus21-admin, cyrus-admin-2.2
 Description: Cyrus mail system (administration tool)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including:
@@ -120,11 +120,41 @@
  and its deprecated cousin installsieve, which can be used to manage
  sieve scripts.
 
+Package: kolab-cyrus-murder
+Architecture: any
+Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
+Recommends: kolab-cyrus-imapd (= ${Source-Version}), kolab-cyrus-pop3d (= ${Source-Version})
+Replaces: cyrus21-murder
+Conflicts: cyrus21-murder, cyrus-murder-2.2
+Description: Cyrus mail system (proxies and aggregator)
+ Cyrus is a fully-featured IMAP daemon, with a number of features not
+ found in other IMAP implementations, including:
+  o Designed to handle massive quantities of mail
+  o No need for users to have login accounts
+  o Virtual domain support
+  o Support for POP3 in addition to IMAP
+  o Sieve server-side email filtering
+  o Servers don't run as root
+  o Easy support for mail quotas
+  o SSL support, including secure IMAP
+  o DRAC support for pop/imap-before-smtp
+  o IPv6 support
+ For more information, see http://asg.web.cmu.edu/cyrus/.
+ .
+ Note: Cyrus doesn't support reading from and storing mail in your
+ standard mail spool - it stores mail in a separate directory in its
+ own MH-like format.
+ .
+ This package contains Cyrus murder aggregator system, i.e. IMAP, POP3
+ and LMTP proxies, and the mupdate mailbox master daemon.  It allows for
+ cluster setups where there are many backend Cyrus spools and frontend
+ proxy servers.
+
 Package: kolab-cyrus-clients
 Architecture: any
 Depends: ${shlibs:Depends}
 Replaces: cyrus21-clients
-Conflicts: cyrus21-clients
+Conflicts: cyrus21-clients, cyrus-clients-2.2
 Description: Cyrus mail system (test clients)
  Cyrus is a fully-featured IMAP daemon, with a number of features not
  found in other IMAP implementations, including: