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

Steffen Joeris white-guest at costa.debian.org
Mon Jan 30 15:28:56 UTC 2006


Author: white-guest
Date: 2006-01-30 15:28:55 +0000 (Mon, 30 Jan 2006)
New Revision: 244

Added:
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.dirs
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.linda
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.dirs
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.manpages
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.dirs
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.files
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.manpages
Modified:
   trunk/kolab-cyrus-imapd/debian/control
   trunk/kolab-cyrus-imapd/debian/rules
Log:
* restore pop3d, admin and clients because we will fork them too


Modified: trunk/kolab-cyrus-imapd/debian/control
===================================================================
--- trunk/kolab-cyrus-imapd/debian/control	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/control	2006-01-30 15:28:55 UTC (rev 244)
@@ -3,7 +3,8 @@
 Priority: extra
 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel at lists.alioth.debian.org>
 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, cdbs (>= 0.4.0), libldap2-dev, transfig, gs, groff
+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
+Build-Depends-Indep: transfig, gs, groff
 Standards-Version: 3.6.2
 
 Package: kolab-cyrus-common
@@ -62,10 +63,96 @@
  This package contains support for IMAP (Internet Mail Access
  Protocol).
 
+Package: kolab-cyrus-pop3d
+Architecture: any
+Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: pop3-server
+Replaces: cyrus21-pop3d
+Conflicts: pop3-server, cyrus21-pop3d
+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:
+  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 support for POP3 (Post Office Protocol).
+
+Package: kolab-cyrus-admin
+Architecture: all
+Depends: kolab-libcyrus-imap-perl (>= ${Source-Version})
+Suggests: sasl2-bin
+Replaces: cyrus21-admin
+Conflicts: cyrus-admin, cyrus21-admin
+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:
+  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 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.
+
+Package: kolab-cyrus-clients
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: cyrus21-clients
+Conflicts: cyrus21-clients
+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:
+  o Designed to handle massive quantities of mail
+  o No need for users to have login accounts
+  o Support for POP3 in addition to IMAP
+  o Virtual domain support
+  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 the mupdatetest, sivtest, smtptest, lmtptest,
+ imtest and pop3test tools which can be used to interactivily 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, libcyrus-imap-perl22
+Provides: libcyrus-imap-perl
 Conflicts: libcyrus-imap-perl, libcyrus-imap-perl21
 Replaces: libcyrus-imap-perl, libcyrus-imap-perl21
 Section: perl

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.README.Debian	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1,9 @@
+Cyrus IMAP for Debian, admin utilities
+$Id: cyrus22-admin.README.Debian 5 2005-03-12 23:19:45Z sven $
+---------------------
+
+Refer to the cyrus22-doc package for more information.  There is a lot
+of it, and it will save you hours (or days) of frustating bug-hunting if
+you read them first.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.dirs	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.dirs	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1 @@
+usr/bin

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.files	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1,4 @@
+usr/bin/cyradm
+usr/bin/sieveshell
+usr/bin/installsieve
+usr/share/icons/*

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.linda
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.linda	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.linda	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1,2 @@
+Tag: interp-minus-n-fails
+Data: usr/bin/cyradm

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.lintian	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1 @@
+kolab-cyrus-admin: shell-script-fails-syntax-check ./usr/bin/cyradm

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.manpages	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1,3 @@
+man/sieveshell.1
+perl/imap/blib/man1/cyradm.1p
+debian/tmp/usr/share/man/man1/installsieve.1

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-admin.menu	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1,6 @@
+?package(kolab-cyrus-admin):needs="text" section="Apps/System/Admin"\
+	hints="Mail,Admin,Cyrus"\
+	title="Cyrus 2.2 cyradm (cyrus at localhost)"\
+	longtitle="Administer local Cyrus IMAPd 2.2 accounts as user cyrus"\
+	icon="/usr/share/icons/cyradm.xpm"\
+	command="/usr/bin/cyradm --user cyrus localhost"

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.README.Debian	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1,9 @@
+Cyrus IMAP for Debian, generic SASL-enabled protocol clients
+$Id: cyrus22-clients.README.Debian 5 2005-03-12 23:19:45Z sven $
+---------------------
+
+Refer to the cyrus22-doc package for more information.  There is a lot
+of it, and it will save you hours (or days) of frustating bug-hunting if
+you read them first.
+
+ -- Henrique de Moraes Holschuh <hmh at debian.org>

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.dirs	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.dirs	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1 @@
+usr/bin

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.manpages	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-clients.manpages	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1 @@
+man/*test.1

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.dirs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.dirs	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.dirs	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1 @@
+usr/lib/cyrus

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.files
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.files	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.files	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1,4 @@
+etc/pam.d/pop
+usr/sbin/pop3*
+usr/lib/cyrus/bin/pop3d
+usr/share/man/man8/pop3d*

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.links	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1 @@
+usr/share/doc/kolab-cyrus-common usr/share/doc/kolab-cyrus-pop3d

Added: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.manpages
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.manpages	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-pop3d.manpages	2006-01-30 15:28:55 UTC (rev 244)
@@ -0,0 +1 @@
+man/pop3d.8

Modified: trunk/kolab-cyrus-imapd/debian/rules
===================================================================
--- trunk/kolab-cyrus-imapd/debian/rules	2006-01-26 22:48:05 UTC (rev 243)
+++ trunk/kolab-cyrus-imapd/debian/rules	2006-01-30 15:28:55 UTC (rev 244)
@@ -191,9 +191,12 @@
 	#mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib
 
 	# for stuff in /etc
-	mkdir -p $(TMPPKG)/etc/cyrus
+	mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d
 	install -m 644 debian/imapd.conf    $(TMPPKG)/etc
 	install -m 644 debian/cyrus.conf    $(TMPPKG)/etc
+	(cd debian ; for i in *.pam ;\
+		do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\
+	done)
 
 	# We rename some utils, so we need to sort out the manpages
 	for i in master reconstruct quota deliver ; do \
@@ -237,6 +240,14 @@
 	# And other misc useful tools
 	install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort
 
+	# Install imtest and its symlinks
+	mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/kolab-cyrus-clients/usr/bin
+	for i in $(TMPPKG)/usr/bin/*test ; do \
+		rm -f "$$i" || true ;\
+		(cd $(CURDIR)/debian/kolab-cyrus-clients/usr/bin &&\
+		 ln -s imtest `basename $$i`) ;\
+	done
+
 	# Lintian and Linda overrides
 	cd debian ; \
 	for i in *.linda ; do \
@@ -257,22 +268,55 @@
 	dh_testdir
 	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) \;
+	#-(cd $(PKGDIR)/usr/share/doc/$(MAINPKG) && rm copyrights changes htmlstrip.c)
+	#find $(PKGDIR)/usr/share/doc/$(MAINPKG) -type f ! -name '*txt' ! -name '*.*' -exec mv {} {}.txt \;
+	dh_movefiles -i
 
 binary-indep: install-indep
+	dh_testdir -i
+	dh_testroot -i
+#	dh_installdebconf -i
+	dh_installdocs -p kolab-cyrus-admin
+	dh_installexamples -p kolab-cyrus-admin
+	dh_installmenu -i
+#	dh_installlogrotate -i
+#	dh_installpam -i
+#	dh_installmime -i
+#	dh_installcron -i
+	dh_installman -i
+	dh_installchangelogs -p kolab-cyrus-admin doc/changes.html
+	dh_strip -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_makeshlibs -i
+	dh_installdeb -i
+	dh_perl -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 binary-arch: install-arch
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdebconf -a
-	dh_installdocs -p $(MAINPKG) -p kolab-libcyrus-imap-perl
-	dh_installexamples -p $(MAINPKG) -p kolab-libcyrus-imap-perl
+	dh_installdocs -p $(MAINPKG) -p kolab-cyrus-clients -p kolab-libcyrus-imap-perl
+	dh_installexamples -p $(MAINPKG) -p kolab-libcyrus-imap-perl -p kolab-cyrus-clients
+	dh_installmenu -a
 #	dh_installlogrotate -a
+#	dh_installpam -a
 #	dh_installmime -a
 	dh_installinit -p $(MAINPKG) --noscripts --name=kolab-cyrus
 	dh_installcron -a
 	dh_installman -a
 #	dh_installinfo -a
-	dh_installchangelogs -p $(MAINPKG) doc/changes.html
+	dh_installchangelogs -p $(MAINPKG) -p kolab-cyrus-clients doc/changes.html
 	dh_installchangelogs -p kolab-libcyrus-imap-perl perl/imap/Changes
 	dh_fixperms -a
 	dh_strip -a




More information about the pkg-kolab-devel mailing list