[SVN] r413 - in /branches/dual-build/cyrus-imapd-2.2.13/debian: control cyrus-imapd-idled-2.2.dirs cyrus-imapd-idled-2.2.install cyrus-imapd-idled-2.2.links cyrus-imapd-idled-2.2.manpages rules

debian at incase.de debian at incase.de
Sat May 6 02:22:29 UTC 2006 

Author: astronut
Date: Sat May  6 04:22:21 2006
New Revision: 413

URL: https://mail.incase.de/viewcvs?rev=413&root=cyrus22&view=rev
Log:
Hopefully this is going to work the first try. And if you beleive that, I have a bridge in Brooklyn I'd be happy to sell you, cheap.

Added:
    branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-idled-2.2.dirs
      - copied unchanged from r411, branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.dirs
    branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-idled-2.2.install
      - copied, changed from r411, branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.install
    branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-idled-2.2.links
      - copied unchanged from r411, branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.links
    branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-idled-2.2.manpages
      - copied unchanged from r411, branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.manpages
Modified:
    branches/dual-build/cyrus-imapd-2.2.13/debian/control
    branches/dual-build/cyrus-imapd-2.2.13/debian/rules

Modified: branches/dual-build/cyrus-imapd-2.2.13/debian/control
URL: https://mail.incase.de/viewcvs/branches/dual-build/cyrus-imapd-2.2.13/debian/control?rev=413&root=cyrus22&r1=412&r2=413&view=diff
==============================================================================
--- branches/dual-build/cyrus-imapd-2.2.13/debian/control (original)
+++ branches/dual-build/cyrus-imapd-2.2.13/debian/control Sat May  6 04:22:21 2006
@@ -31,7 +31,7 @@
   o NNTP 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.
  .
@@ -63,7 +63,23 @@
  of the Cyrus IMAPd suite.
  .
  For more information, please see the cyrus-common-2.2 package.
-  
+
+Package: cyrus-imapd-idled-2.2
+Architecture: any
+Section: mail
+Depends: cyrus-common-2.2 (= ${Source-Version}), ${shlibs:Depends}
+Provides: imap-server, cyrus21-imapd, cyrus22-imapd, cyrus-imapd-2.2
+Conflicts: imap-server, cyrus21-imapd, cyrus22-imapd, cyrus-imapd-2.2
+Replaces: cyrus21-imapd, cyrus22-imapd, cyrus-imapd-2.2
+Description: Cyrus mail system (IMAP support)
+ This package contains the IMAP (Internet Mail Access  Protocol) portion
+ of the Cyrus IMAPd suite.
+ .
+ This package contains a special build of imapd that uses idled for idle
+ support. For more information, see [todo].
+ .
+ For more information, please see the cyrus-common-2.2 package.
+
 
 Package: cyrus-pop3d-2.2
 Architecture: any
@@ -88,7 +104,7 @@
 Provides: cyrus21-admin, cyrus22-admin
 Description: Cyrus mail system (administration tools)
  This package provides the administrative tools for the Cyrus IMAPd suite.
- It contains the cyradm tool which can be used to administer 
+ It 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.
@@ -110,7 +126,7 @@
  frontend proxy servers.
  .
  For more information, please see the cyrus-common-2.2 package.
-  
+
 
 Package: cyrus-nntpd-2.2
 Architecture: any
@@ -124,7 +140,7 @@
  the Cyrus IMAPd suite.
  .
  For more information, please see the cyrus-common-2.2 package.
- 
+
 Package: cyrus-clients-2.2
 Architecture: any
 Section: mail
@@ -135,12 +151,12 @@
 Description: Cyrus mail system (test clients)
  This package contains client tools to test the Cyrus IMAPd suite.
  It 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.
  .
  For more information, please see the cyrus-common-2.2 package.
-  
+
 
 Package: cyrus-dev-2.2
 Architecture: any
@@ -150,11 +166,11 @@
 Replaces: cyrus21-dev, cyrus22-dev
 Provides: cyrus21-dev, cyrus22-dev
 Description: Cyrus mail system (developer files)
- This package contains header files and the static library needed 
+ This package contains header files and the static library needed
  to develop IMAP applications that interface with the Cyrus IMAPd suite.
  .
  For more information, please see the cyrus-common-2.2 package.
-  
+
 
 Package: libcyrus-imap-perl22
 Architecture: any
@@ -174,4 +190,4 @@
  undocumented upstream.
  .
  For more information, please see the cyrus-common-2.2 package.
-  
+

Copied: branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-idled-2.2.install (from r411, branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.install)
URL: https://mail.incase.de/viewcvs/branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-idled-2.2.install?p2=branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-idled-2.2.install&p1=branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.install&r1=411&r2=413&rev=413&root=cyrus22&view=diff
==============================================================================
--- branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-2.2.install (original)
+++ branches/dual-build/cyrus-imapd-2.2.13/debian/cyrus-imapd-idled-2.2.install Sat May  6 04:22:21 2006
@@ -1,3 +1,3 @@
 etc/pam.d/imap
-usr/lib/cyrus/bin/imapd
+usr/lib/cyrus/bin-idled/* usr/lib/cyrus/bin
 usr/sbin/squatter

Modified: branches/dual-build/cyrus-imapd-2.2.13/debian/rules
URL: https://mail.incase.de/viewcvs/branches/dual-build/cyrus-imapd-2.2.13/debian/rules?rev=413&root=cyrus22&r1=412&r2=413&view=diff
==============================================================================
--- branches/dual-build/cyrus-imapd-2.2.13/debian/rules (original)
+++ branches/dual-build/cyrus-imapd-2.2.13/debian/rules Sat May  6 04:22:21 2006
@@ -85,6 +85,9 @@
 	cp /usr/share/misc/config.sub config.sub
 	cp /usr/share/misc/config.guess config.guess
 	touch configure.in && touch aclocal.m4 && touch configure
+
+	# Change configuration
+	-rm configure-idled-stamp
 
 	# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
 	# DBENGINE AT THE TOP OF THIS MAKEFILE!
@@ -163,7 +166,79 @@
 
 	touch build-indep-stamp
 
-install-arch: build-arch
+
+configure-idled-stamp: patch
+	dh_testdir
+	-rm -f config.sub config.guess
+	cp /usr/share/misc/config.sub config.sub
+	cp /usr/share/misc/config.guess config.guess
+	touch configure.in && touch aclocal.m4 && touch configure
+
+	# Configure idled not poll
+	-rm configure-stamp
+
+	# IF YOU CHANGE BERKELEY DB VERSION, MAKE SURE TO UPDATE
+	# DBENGINE AT THE TOP OF THIS MAKEFILE!
+	./configure CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
+	 --with-extraident=$(EXTRA_IDENT) \
+	 --prefix=/usr/share --exec-prefix=/usr --libexecdir=/usr/sbin \
+	 --bindir=/usr/sbin --sbindir=/usr/sbin \
+	 --includedir=/usr/include/cyrus \
+	 --datadir=/usr/share/cyrus --sysconfdir=/etc \
+	 --with-statedir=/var/state \
+	 --sharedstatedir=/usr/share/cyrus \
+	 --localstatedir=/var/lib/cyrus \
+	 --with-cyrus-prefix=/usr/lib/cyrus --with-lock=fcntl \
+	 --with-perl=/usr/bin/perl \
+	 --with-openssl=/usr --with-auth=unix \
+	 --enable-murder --enable-nntp \
+	 --disable-listext --enable-annotatemore --with-sasl=/usr \
+	 --with-idle=idled --with-drac=/usr \
+	 --with-cyrus-user=cyrus --with-cyrus-group=mail \
+	 --with-tclsh=/usr/bin/tclsh --with-com_err=/usr \
+	 --with-pidfile=/var/run/cyrmaster.pid \
+	 --with-syslogfacility=MAIL \
+	 --with-seen-db=skiplist --with-mboxlist-db=skiplist \
+	 --with-ucdsnmp=/usr
+	echo 'To build this package, configure was called as follows:' \
+		> debian/README.configure-options
+	grep with\ options config.status \
+	| sed -e 's/^.*options \\"/configure /;s/\\"$///' \
+		>> debian/README.configure-options
+	sed -i 's/ -lsensors//' master/Makefile
+	touch configure-idled-stamp
+
+build-arch-idled: build-arch-idled-stamp
+
+build-arch-idled-stamp: configure-idled-stamp
+	dh_testdir
+
+	PERL_MM_OPT="INSTALLDIRS=vendor" $(MAKE)
+	# store database configuration for possible automatic
+	# upgrading later
+	echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt
+	grep -E 'CONFIG_DB_[A-Z]+[[:space:]]+[(]' config.h |\
+	  sed -e 's/&cyrusdb_//' -e 's/.*CONFIG_DB_//' -e 's/(//' -e 's/)//' \
+	  >>debian/cyrus-db-types.txt
+	mv debian/cyrus-db-types.txt debian/cyrus-db-types.txt.old \
+	&& sort -u < debian/cyrus-db-types.txt.old > debian/cyrus-db-types.txt \
+	&& rm debian/cyrus-db-types.txt.old
+
+	# store some useful state about the current package
+	echo "PACKAGE_VERSION $(DEBVERSION)" >debian/cyrus-hardwired-config.txt
+	if grep -q -s -n -E '^[[:space:]]*#define[[:space:]]+USE_DIR_FULL[[:space:]]+1' config.h ; then \
+		echo "USE_DIR_FULL 1" >>debian/cyrus-hardwired-config.txt ;\
+	else \
+		echo "USE_DIR_FULL 0" >>debian/cyrus-hardwired-config.txt ;\
+	fi
+
+	mkdir -p $(TMPPKG)/usr/lib/cyrus/bin-idled/
+	mv imap/idled $(TMPPKG)/usr/lib/cyrus/bin-idled/
+	mv imap/imapd $(TMPPKG)/usr/lib/cyrus/bin-idled/
+
+	touch build-arch-idled-stamp
+
+install-arch: build-arch-idled build-arch
 	dh_testdir
 	dh_testroot
 	dh_clean -k

More information about the Pkg-Cyrus-imapd-Debian-devel mailing list