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

[Steffen Joeris]

Author: white-guest
Date: 2006-01-24 11:37:44 +0000 (Tue, 24 Jan 2006)
New Revision: 197

Removed:
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.docs
   trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links
Modified:
   trunk/kolab-cyrus-imapd/debian/control
   trunk/kolab-cyrus-imapd/debian/rules
Log:
* we don't make a -doc package
* the users can take the cyrus22-doc package


Modified: trunk/kolab-cyrus-imapd/debian/control
===================================================================
--- trunk/kolab-cyrus-imapd/debian/control	2006-01-24 11:34:56 UTC (rev 196)
+++ trunk/kolab-cyrus-imapd/debian/control	2006-01-24 11:37:44 UTC (rev 197)
@@ -36,32 +36,6 @@
  to enable IMAP and POP3 support respectively. kolab-cyrus-murder can be
  used to enable IMAP, POP3 and LMTP proxying.
 
-Package: kolab-cyrus-doc
-Architecture: all
-Provides: cyrus21-docs, cyrus21-doc
-Replaces: cyrus21-docs, cyrus21-doc
-Conflicts: cyrus21-docs, cyrus21-doc
-Description: Cyrus mail system (documentation files)
- 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 documentation for the Cyrus IMAPd suite.
-
 Package: kolab-cyrus-imapd
 Architecture: any
 Depends: kolab-cyrus-common (= ${Source-Version}), ${shlibs:Depends}

Deleted: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base	2006-01-24 11:34:56 UTC (rev 196)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.doc-base	2006-01-24 11:37:44 UTC (rev 197)
@@ -1,10 +0,0 @@
-Document: cyrus22-manual
-Title: CMU Cyrus 2.2 Manual
-Author: Carnegie Mellon University
-Abstract: This manual describes how to configure and administer 
- the Cyrus POP/IMAP mail system, version 2.2
-Section: mail
-
-Format: HTML
-Index: /usr/share/doc/cyrus22-doc/html/index.html
-Files: /usr/share/doc/cyrus22-doc/html/*.html

Deleted: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.docs
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.docs	2006-01-24 11:34:56 UTC (rev 196)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.docs	2006-01-24 11:37:44 UTC (rev 197)
@@ -1,2 +0,0 @@
-debian/UPGRADE.Debian
-debian/README.*

Deleted: trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links
===================================================================
--- trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links	2006-01-24 11:34:56 UTC (rev 196)
+++ trunk/kolab-cyrus-imapd/debian/kolab-cyrus-doc.links	2006-01-24 11:37:44 UTC (rev 197)
@@ -1 +0,0 @@
-usr/share/doc/kolab-cyrus-doc usr/share/doc/kolab-cyrus-common/docs

Modified: trunk/kolab-cyrus-imapd/debian/rules
===================================================================
--- trunk/kolab-cyrus-imapd/debian/rules	2006-01-24 11:34:56 UTC (rev 196)
+++ trunk/kolab-cyrus-imapd/debian/rules	2006-01-24 11:37:44 UTC (rev 197)
@@ -11,10 +11,8 @@
 export DH_ALWAYS_EXCLUDE=CVS
 
 export MAINPKG=kolab-cyrus-common
-export DOCPKG=kolab-cyrus-doc
 export TMPPKG := $(CURDIR)/debian/tmp
 export PKGDIR := $(CURDIR)/debian/$(MAINPKG)
-export DOCDIR := $(CURDIR)/debian/$(DOCPKG)/usr/share/doc/$(DOCPKG)
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -271,31 +269,13 @@
 	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 \;
-
-	# Install the html docs and examples
-	mkdir -p $(DOCDIR)/html
-	install -m 644 doc/*.html doc/murder.png $(DOCDIR)/html
-	cp -a doc/man $(DOCDIR)/html
-	cp -a debian/examples $(DOCDIR)
-	install -m 644 doc/cyrusv2.mc $(DOCDIR)/examples
-
-	# Install contrib/ files
-	mkdir -p $(DOCDIR)/contrib
-	xargs < debian/kolab-cyrus-common.contrib -rti cp -r '{}' $(DOCDIR)/contrib
-
 	dh_movefiles -i
 
 binary-indep: install-indep
 	dh_testdir -i
 	dh_testroot -i
 #	dh_installdebconf -i
-	dh_installdocs -p kolab-cyrus-admin -p kolab-cyrus-doc
+	dh_installdocs -p kolab-cyrus-admin
 	dh_installexamples -p kolab-cyrus-admin
 	dh_installmenu -i
 #	dh_installlogrotate -i
@@ -304,7 +284,6 @@
 #	dh_installcron -i
 	dh_installman -i
 	dh_installchangelogs -p kolab-cyrus-admin doc/changes.html
-	dh_installchangelogs -p kolab-cyrus-doc
 	dh_strip -i
 	dh_link -i
 	dh_compress -i