[SVN] r407 - /branches/dual-build/cyrus-imapd-2.2.13/debian/rules

[debian at incase.de]

Author: astronut
Date: Fri May  5 22:44:51 2006
New Revision: 407

URL: https://mail.incase.de/viewcvs?rev=407&root=cyrus22&view=rev
Log:
Hopefully this works, trying to switch from dh_movefiles to dh_install, a prerequisite of the dual-build

Modified:
    branches/dual-build/cyrus-imapd-2.2.13/debian/rules

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=407&root=cyrus22&r1=406&r2=407&view=diff
==============================================================================
--- branches/dual-build/cyrus-imapd-2.2.13/debian/rules (original)
+++ branches/dual-build/cyrus-imapd-2.2.13/debian/rules Fri May  5 22:44:51 2006
@@ -49,10 +49,10 @@
 	CONFFLAGS += --enable-warnings-are-errors
 endif
 
-# The clean target will remove any and all cruft (as defined by 
-# configure ; make distclean ; cd intl; make distclean ). 
-# This is done to make sure the build daemon's source tree is the 
-# same as the one I am using to produce the i386 debs. 
+# The clean target will remove any and all cruft (as defined by
+# configure ; make distclean ; cd intl; make distclean ).
+# This is done to make sure the build daemon's source tree is the
+# same as the one I am using to produce the i386 debs.
 clean: clean-patched unpatch
 clean-patched: configure
 	dh_testdir
@@ -63,7 +63,7 @@
 	-rm -f config.h config.cache config.status config.log stamp-config confdefs.h
 	-rm -f netnews/Makefile perl/imap/Makefile.old perl/sieve/managesieve/Makefile.old snmp/Makefile Makefile et/Makefile
 	-rm -f doc/pod2htm*
-	-rm -f master/makedepend.log 
+	-rm -f master/makedepend.log
 	-rm -rf doc/man
 	-rm -f debian/cyrus-db-types.txt debian/cyrus-hardwired-config.txt debian/README.configure-options
 	# -rm -rf et/
@@ -160,7 +160,7 @@
 
 	touch build-indep-stamp
 
-install-arch: build-arch 
+install-arch: build-arch
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -262,7 +262,7 @@
 		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
 	done
 
-	dh_movefiles -a
+	dh_install -a --sourcedir=$(PKGDIR)
 	touch install-arch-stamp
 
 # We aren't actually able to install arch-indep independently from
@@ -290,7 +290,7 @@
 	mkdir -p $(DOCDIR)/contrib
 	xargs < debian/cyrus-common-2.2.contrib -rti cp -r '{}' $(DOCDIR)/contrib
 
-	dh_movefiles -i
+	dh_install -i --sourcedir=$(PKGDIR)
 
 binary-indep: install-indep
 	dh_testdir -i