[pkg-kolab] r495 - kolab-cyrus-imapd/trunk/debian

Peter Eisentraut petere at alioth.debian.org
Wed Nov 1 00:13:31 CET 2006


Author: petere
Date: 2006-11-01 00:13:31 +0100 (Wed, 01 Nov 2006)
New Revision: 495

Modified:
   kolab-cyrus-imapd/trunk/debian/control
   kolab-cyrus-imapd/trunk/debian/rules
Log:
Remove some gratuitous differences from original cyrus package

Modified: kolab-cyrus-imapd/trunk/debian/control
===================================================================
--- kolab-cyrus-imapd/trunk/debian/control	2006-10-31 22:45:24 UTC (rev 494)
+++ kolab-cyrus-imapd/trunk/debian/control	2006-10-31 23:13:31 UTC (rev 495)
@@ -9,9 +9,9 @@
 
 Package: kolab-cyrus-common
 Architecture: any
-Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: postfix | mail-transport-agent, adduser (>= 3.34), dpkg (>> 1.9.0), netbase (>= 4.07), gawk, ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}
+Conflicts: suidmanager (<< 0.50), cyrus-common, cyrus-common-2.2, cyrus21-common
 Replaces: 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:
@@ -27,7 +27,7 @@
   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
+ 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.
  .
@@ -38,8 +38,9 @@
 Package: kolab-cyrus-imapd
 Architecture: any
 Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: imap-server
+Conflicts: imap-server, cyrus21-imapd, cyrus-imapd-2.2
 Replaces: 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:
@@ -55,8 +56,8 @@
   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
+ 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 support for IMAP (Internet Mail Access
@@ -66,8 +67,8 @@
 Architecture: any
 Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
 Provides: pop3-server
+Conflicts: pop3-server, cyrus21-pop3d, cyrus-pop3d-2.2
 Replaces: 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:
@@ -83,8 +84,8 @@
   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
+ 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 support for POP3 (Post Office Protocol).
@@ -93,8 +94,8 @@
 Architecture: all
 Depends: kolab-libcyrus-imap-perl (>= ${Source-Version})
 Suggests: sasl2-bin
+Conflicts: cyrus-admin, cyrus21-admin, cyrus-admin-2.2
 Replaces: 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:
@@ -110,11 +111,11 @@
   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
+ 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 the cyradm tool which can be used to administer
+ This package contains the cyradm tool which can be used to administer 
  both local and remote Cyrus mail systems.  It also contains sieveshell
  and its deprecated cousin installsieve, which can be used to manage
  sieve scripts.
@@ -122,8 +123,9 @@
 Package: kolab-cyrus-clients
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: cyrus21-clients, cyrus-clients-2.2
+Provides: cyrus21-clients
 Replaces: 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:
@@ -139,19 +141,19 @@
   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
+ 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 the mupdatetest, sivtest, smtptest, lmtptest,
- imtest and pop3test tools which can be used to interactively talk to
+ imtest and pop3test tools which can be used to interactively talk to 
  a mupdate, sieve, smtp, lmtp, imap or pop3 server.
  The clients are fully SASL-enabled for authentication.
 
 Package: kolab-libcyrus-imap-perl
 Architecture: any
 Depends: ${perl:Depends}, ${shlibs:Depends}
-Provides: libcyrus-imap-perl
+Provides: libcyrus-imap-perl, libcyrus-imap-perl21
 Conflicts: libcyrus-imap-perl, libcyrus-imap-perl21
 Replaces: libcyrus-imap-perl, libcyrus-imap-perl21
 Section: perl
@@ -178,4 +180,3 @@
  .
  The modules that compose Cyrus::SIEVE are also included, but they are
  undocumented upstream.
-

Modified: kolab-cyrus-imapd/trunk/debian/rules
===================================================================
--- kolab-cyrus-imapd/trunk/debian/rules	2006-10-31 22:45:24 UTC (rev 494)
+++ kolab-cyrus-imapd/trunk/debian/rules	2006-10-31 23:13:31 UTC (rev 495)
@@ -266,7 +266,7 @@
 	dh_testroot
 	#dh_clean -k
 	dh_installdirs -i
-	
+
 	# Massage the documentation into place
 	#mkdir -p $(DOCDIR)
 	#find doc/text -name '[Ra-z]*' -type f -exec cp -f {} $(PKGDIR)/usr/share/doc/$(MAINPKG) \;




More information about the pkg-kolab-devel mailing list