[SVN] r514 - in /branches: idled/debian/rules sarge-2.2.13/debian/rules

[debian at incase.de]

Author: sven
Date: Sat Jul 22 00:17:07 2006
New Revision: 514

URL: https://mail.incase.de/viewcvs?rev=514&root=cyrus22&view=rev
Log:
Merge r513 into sarge and idled branches

Modified:
    branches/idled/debian/rules
    branches/sarge-2.2.13/debian/rules

Modified: branches/idled/debian/rules
URL: https://mail.incase.de/viewcvs/branches/idled/debian/rules?rev=514&root=cyrus22&r1=513&r2=514&view=diff
==============================================================================
--- branches/idled/debian/rules (original)
+++ branches/idled/debian/rules Sat Jul 22 00:17:07 2006
@@ -123,7 +123,7 @@
 	# upgrading later
 	echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt
 	grep _db lib/imapoptions \
-	| cut -d, -f1-2 | sed -e 's/{ "//;s/_db", "/ /;s/"\$//' \
+	| cut -d, -f1-2 | sed -e 's/{ "//;s/_db", "/ /;s/"$$//' \
 	| sed -e 's/^tls.* /TLS /;s/^subs.* /SUBS /;s/^seen.* /SEEN /;s/^pts.* /PTS /;s/^mbox.* /MBOX /'\
 	| awk '{printf("%s %s\n",toupper($1),$2);}' \
 	>>debian/cyrus-db-types.txt

Modified: branches/sarge-2.2.13/debian/rules
URL: https://mail.incase.de/viewcvs/branches/sarge-2.2.13/debian/rules?rev=514&root=cyrus22&r1=513&r2=514&view=diff
==============================================================================
--- branches/sarge-2.2.13/debian/rules (original)
+++ branches/sarge-2.2.13/debian/rules Sat Jul 22 00:17:07 2006
@@ -99,7 +99,7 @@
 	 --with-openssl=/usr --with-auth=unix \
 	 --enable-murder --enable-nntp \
 	 --disable-listext --enable-annotatemore --with-sasl=/usr \
-	 --with-idle=poll --with-drac=/usr \
+	 --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 \
@@ -123,7 +123,7 @@
 	# upgrading later
 	echo "DBENGINE $(DBENGINE)" >>debian/cyrus-db-types.txt
 	grep _db lib/imapoptions \
-	| cut -d, -f1-2 | sed -e 's/{ "//;s/_db", "/ /;s/"$//' \
+	| cut -d, -f1-2 | sed -e 's/{ "//;s/_db", "/ /;s/"$$//' \
 	| sed -e 's/^tls.* /TLS /;s/^subs.* /SUBS /;s/^seen.* /SEEN /;s/^pts.* /PTS /;s/^mbox.* /MBOX /'\
 	| awk '{printf("%s %s\n",toupper($1),$2);}' \
 	>>debian/cyrus-db-types.txt