[SVN] r513 - /trunk/cyrus-imapd-2.2.13/debian/rules

[debian at incase.de]

Author: sven
Date: Sat Jul 22 00:10:51 2006
New Revision: 513

URL: https://mail.incase.de/viewcvs?rev=513&root=cyrus22&view=rev
Log:
really fix the syntax problem

Modified:
    trunk/cyrus-imapd-2.2.13/debian/rules

Modified: trunk/cyrus-imapd-2.2.13/debian/rules
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/rules?rev=513&root=cyrus22&r1=512&r2=513&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/rules (original)
+++ trunk/cyrus-imapd-2.2.13/debian/rules Sat Jul 22 00:10:51 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 \
@@ -109,7 +109,7 @@
 	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/\\"\$///' \
+	| sed -e 's/^.*options \\"/configure /;s/\\"$///' \
 		>> debian/README.configure-options
 	sed -i 's/ -lsensors//' master/Makefile
 	touch configure-stamp
@@ -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
@@ -264,7 +264,7 @@
 		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
 	done
 
-	dh_install -a --sourcedir=$(TMPPKG)
+	dh_movefiles -a
 	touch install-arch-stamp
 
 # We aren't actually able to install arch-indep independently from
@@ -292,7 +292,7 @@
 	mkdir -p $(DOCDIR)/contrib
 	xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib
 
-	dh_install -i --sourcedir=$(TMPPKG)
+	dh_movefiles -i
 
 binary-indep: install-indep
 	dh_testdir -i