[SVN] r777 - in /branches: cyrus23-farzy/ cyrus23/cyrus-imapd-2.3-2.3.7/ cyrus23/cyrus-imapd-2.3-2.3.7/debian/ cyrus23/cyrus-imapd-2.3-2.3.7/debian/examples/ cyrus23/cyrus-imapd-2.3-2.3.8/ cyrus23/cyrus-imapd-2.3-2.3.8/debian/ cyrus23/cyrus-imapd-2.3-2.3.8/debian/examples/ cyrus23/cyrus-imapd-2.3-development/ cyrus23/cyrus-imapd-2.3-development/debian/ cyrus23/cyrus-imapd-2.3-development/debian/examples/ dual-build/

debian at incase.de debian at incase.de
Wed Jun 3 20:35:57 UTC 2009


Author: sven
Date: Wed Jun  3 22:35:56 2009
New Revision: 777

URL: https://mail.incase.de/viewcvs?rev=777&root=cyrus22&view=rev
Log:
Update debian/rules to avoid calling phony targets from ones intended to be non-phony (which effectively makes those phony, too), change mboxtocyrus script to avoid bashisms

Removed:
    branches/cyrus23-farzy/
    branches/dual-build/
Modified:
    branches/cyrus23/cyrus-imapd-2.3-2.3.7/   (props changed)
    branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog
    branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/examples/mboxtocyrus
    branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/rules
    branches/cyrus23/cyrus-imapd-2.3-2.3.8/   (props changed)
    branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog
    branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/examples/mboxtocyrus
    branches/cyrus23/cyrus-imapd-2.3-development/   (props changed)
    branches/cyrus23/cyrus-imapd-2.3-development/debian/changelog
    branches/cyrus23/cyrus-imapd-2.3-development/debian/examples/mboxtocyrus
    branches/cyrus23/cyrus-imapd-2.3-development/debian/rules

Propchange: branches/cyrus23/cyrus-imapd-2.3-2.3.7/
------------------------------------------------------------------------------
    svn:mergeinfo = /trunk/cyrus-imapd-2.2.13:765,776

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog?rev=777&root=cyrus22&r1=776&r2=777&view=
3Ddiff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/changelog Wed Jun  3 22:35:56 2009
@@ -1,6 +1,11 @@
 cyrus-imapd-2.3 (2.3.7-1~pr1) UNRELEASED-experimental; urgency=low
 
   * New upstream series release (Closes: #382376)
+  * change example script mbox2cyrus to remove bashisms (Closes: #489558,
+    thanks to Andres Mejia)
+  * change Makefile so that no (intended) non-phony target invokes a phony
+    target. Also remove empty lines inside rules or replace them by comment
+    lines
 
     [ Farzad FARID ]
   * IDLE handling has changed, remove Debian patches

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/examples/mboxtocyrus
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/examples/mboxtocyrus?rev=777&root=cyrus22&r1=776&r2=777&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/examples/mboxtocyrus (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/examples/mboxtocyrus Wed Jun  3 22:35:56 2009
@@ -54,11 +54,11 @@
 
 
 
-if [ "$MAILBOX" == "" ]; then
+if [ "$MAILBOX" = "" ]; then
 	MAILBOX=$USER
 fi
 
-if [ "$CYRUSFOLDER" == "" ]; then
+if [ "$CYRUSFOLDER" = "" ]; then
 	echo "Adding mailbox '$MAILBOX' to Cyrus INBOX of user '$USER'..."
 	$FORMAIL -I "From " < $MAILBOX -s $CYRDELIVER $USER
  else

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/rules
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/rules?rev=777&root=cyrus22&r1=776&r2=777&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/rules (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.7/debian/rules Wed Jun  3 22:35:56 2009
@@ -120,7 +120,7 @@
 	# cp /usr/share/misc/config.sub config.sub
 	# cp /usr/share/misc/config.guess config.guess
 	touch configure.in && touch aclocal.m4 && touch configure
-
+	#
 	# 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) \
@@ -156,7 +156,7 @@
 build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp
 	dh_testdir
-
+	#
 	PERL_MM_OPT="INSTALLDIRS=vendor" $(MAKE)
 	# store database configuration for possible automatic
 	# upgrading later
@@ -169,7 +169,7 @@
 	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 \
@@ -177,15 +177,13 @@
 	else \
 		echo "USE_DIR_FULL 0" >>debian/cyrus-hardwired-config.txt ;\
 	fi
-
 	touch build-arch-stamp
 
 # We aren't actually able to build arch-indep independently from
 # arch-dep, so we guarantee that the arch build has been done first
 build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp build-arch
-	dh_testdir
-
+build-indep-stamp: configure-stamp build-arch-stamp
+	dh_testdir
 	cd doc &&\
 	pod2man ../perl/sieve/scripts/sieveshell.pl > ../man/sieveshell.1 &&\
 	fig2dev -L png murder.fig murder.png &&\
@@ -198,17 +196,14 @@
 	done
 	pod2html perl/imap/cyradm.sh > doc/man/cyradm.1.html
 	rm -f pod2htm*
-
 	touch build-indep-stamp
 
-install-arch: build-arch 
+install-arch: build-arch-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs -a
-
 	$(MAKE) install DESTDIR=$(TMPPKG)
-
 	# fix totaly broken location of the include files;
 	# while at it, also avoid namespace collision, and move
 	# lots of admin-only/system-only stuff to sbin and lib
@@ -228,13 +223,11 @@
 	mkdir -p $(TMPPKG)/usr/include
 	mv $(TMPPKG)/usr/share/include/cyrus $(TMPPKG)/usr/include
 	#mv $(TMPPKG)/bin/* $(TMPPKG)/usr/bin
-
 	# Move the perl crap to a saner place
 	mkdir -p $(TMPPKG)/usr/lib
 	mkdir -p $(TMPPKG)/usr/share/perl5
 	#mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus
 	#mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib
-
 	# for stuff in /etc
 	mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d
 	install -m 644 debian/imapd.conf    $(TMPPKG)/etc
@@ -242,37 +235,30 @@
 	(cd debian ; for i in *.pam ;\
 		do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\
 	done)
-
 	# We rename some utils, so we need to sort out the manpages
 	for i in master reconstruct quota deliver ; do \
 		mv $(TMPPKG)/usr/share/man/man8/$$i.8 $(TMPPKG)/usr/share/man/man8/cyr$${i}.8 ; \
 	done
-
 	# And add our own manpages
 	mkdir -p $(TMPPKG)/usr/share/man/man8
 	install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
 	install -m 644 debian/cyrus-makedirs.8 $(TMPPKG)/usr/share/man/man8/cyrus-makedirs.8
 	install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8
-
 	# SNMP files
 	mkdir -p $(TMPPKG)/usr/share/snmp/mibs
 	install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
-
 	# Install cyradm icons
 	mkdir -p $(TMPPKG)/usr/share/icons/mini
 	install -m 644 debian/cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/cyradm.xpm
 	install -m 644 debian/cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/cyradm.xpm
-
 	# Install debian-provided scripts
 	install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs
 	install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb
-
 	# and logcheck files
 	install -m 644 debian/logcheck.ignore \
 	  $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus2_3
 	install -m 644 debian/logcheck.violations.ignore \
 	  $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus2_3
-
 	# Install the stuff needed for upgrades
 	for i in convert-sieve.pl dohash rehash undohash translatesieve \
 		 upgradesieve masssievec; do \
@@ -284,7 +270,6 @@
 		   $(PKGDIR)/usr/lib/cyrus
 	# And other misc useful tools
 	install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort
-
 	# Install imtest and its symlinks
 	mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/cyrus-clients-2.3/usr/bin
 	for i in $(TMPPKG)/usr/bin/*test ; do \
@@ -292,7 +277,6 @@
 		(cd $(CURDIR)/debian/cyrus-clients-2.3/usr/bin &&\
 		 ln -s imtest `basename $$i`) ;\
 	done
-
 	# Lintian and Linda overrides
 	cd debian ; \
 	for i in *.linda ; do \
@@ -303,35 +287,34 @@
 		mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
 		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
 	done
-
 	dh_install -a --sourcedir=$(TMPPKG)
 	touch install-arch-stamp
 
 # We aren't actually able to install arch-indep independently from
 # arch-dep, so we guarantee that the arch build has been done first
-install-indep: build-indep install-arch
+install-indep: build-indep-stamp install-arch
 	dh_testdir
 	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/cyrus-common-2.3.contrib -rti cp -r '{}' $(DOCDIR)/contrib
-
+	#
 	dh_install -i --sourcedir=$(TMPPKG)
 
 binary-indep: install-indep

Propchange: branches/cyrus23/cyrus-imapd-2.3-2.3.8/
------------------------------------------------------------------------------
    svn:mergeinfo = /trunk/cyrus-imapd-2.2.13:776

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog?rev=777&root=cyrus22&r1=776&r2=777&view=
3Ddiff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog Wed Jun  3 22:35:56 2009
@@ -3,6 +3,8 @@
   * Fix a problem in cyrus-common-2.3.postrm (Closes: #439217)
   * Add portoguese debconf translations (Closes: #439405)
   * Update dutch debconf translation to 2.3
+  * change example script mbox2cyrus to remove bashisms (Closes: #489558,
+    thanks to Andres Mejia)
 
  -- Sven Mueller <sven at debian.org>  Tue, 28 Aug 2007 19:30:58 +0200
 

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/examples/mboxtocyrus
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/examples/mboxtocyrus?rev=777&root=cyrus22&r1=776&r2=777&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/examples/mboxtocyrus (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/examples/mboxtocyrus Wed Jun  3 22:35:56 2009
@@ -54,11 +54,11 @@
 
 
 
-if [ "$MAILBOX" == "" ]; then
+if [ "$MAILBOX" = "" ]; then
 	MAILBOX=$USER
 fi
 
-if [ "$CYRUSFOLDER" == "" ]; then
+if [ "$CYRUSFOLDER" = "" ]; then
 	echo "Adding mailbox '$MAILBOX' to Cyrus INBOX of user '$USER'..."
 	$FORMAIL -I "From " < $MAILBOX -s $CYRDELIVER $USER
  else

Propchange: branches/cyrus23/cyrus-imapd-2.3-development/
------------------------------------------------------------------------------
    svn:mergeinfo = /trunk/cyrus-imapd-2.2.13:765,776

Modified: branches/cyrus23/cyrus-imapd-2.3-development/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/changelog?rev=777&root=cyrus22&r1=776&r2=777&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/changelog Wed Jun  3 22:35:56 2009
@@ -3,6 +3,11 @@
   * New upstream release.
   * Remove the sections of Sven's 10-fix_potential_overflows.dpatch
     superceded by upstream fixes by Bron.
+  * change example script mbox2cyrus to remove bashisms (Closes: #489558,
+    thanks to Andres Mejia)
+  * change Makefile so that no (intended) non-phony target invokes a phony
+    target. Also remove empty lines inside rules or replace them by comment
+    lines
 
  -- Duncan Gibb <Duncan.Gibb at siriusit.co.uk>  Thu, 23 Apr 2009 18:54:37 +0100
 

Modified: branches/cyrus23/cyrus-imapd-2.3-development/debian/examples/mboxtocyrus
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/examples/mboxtocyrus?rev=777&root=cyrus22&r1=776&r2=777&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/examples/mboxtocyrus (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/examples/mboxtocyrus Wed Jun  3 22:35:56 2009
@@ -54,11 +54,11 @@
 
 
 
-if [ "$MAILBOX" == "" ]; then
+if [ "$MAILBOX" = "" ]; then
 	MAILBOX=$USER
 fi
 
-if [ "$CYRUSFOLDER" == "" ]; then
+if [ "$CYRUSFOLDER" = "" ]; then
 	echo "Adding mailbox '$MAILBOX' to Cyrus INBOX of user '$USER'..."
 	$FORMAIL -I "From " < $MAILBOX -s $CYRDELIVER $USER
  else

Modified: branches/cyrus23/cyrus-imapd-2.3-development/debian/rules
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-development/debian/rules?rev=777&root=cyrus22&r1=776&r2=777&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-development/debian/rules (original)
+++ branches/cyrus23/cyrus-imapd-2.3-development/debian/rules Wed Jun  3 22:35:56 2009
@@ -124,7 +124,7 @@
 	# 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 CFLAGS="-fno-strict-aliasing -fPIC -Wall -pipe $(DEBUGFLAGS)" $(CONFFLAGS) \
 	 --with-extraident=$(EXTRA_IDENT) \
 	 --prefix=/usr/share --exec-prefix=/usr --libexecdir=/usr/sbin \
@@ -160,7 +160,7 @@
 build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp
 	dh_testdir
-
+	#
 	PERL_MM_OPT="INSTALLDIRS=vendor" $(MAKE)
 	# store database configuration for possible automatic
 	# upgrading later
@@ -173,7 +173,7 @@
 	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 \
@@ -181,15 +181,13 @@
 	else \
 		echo "USE_DIR_FULL 0" >>debian/cyrus-hardwired-config.txt ;\
 	fi
-
 	touch build-arch-stamp
 
 # We aren't actually able to build arch-indep independently from
 # arch-dep, so we guarantee that the arch build has been done first
 build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp build-arch
-	dh_testdir
-
+build-indep-stamp: configure-stamp build-arch-stamp
+	dh_testdir
 	cd doc &&\
 	pod2man ../perl/sieve/scripts/sieveshell.pl > ../man/sieveshell.1 &&\
 	fig2dev -L png murder.fig murder.png &&\
@@ -202,17 +200,14 @@
 	done
 	pod2html perl/imap/cyradm.sh > doc/man/cyradm.1.html
 	rm -f pod2htm*
-
 	touch build-indep-stamp
 
-install-arch: build-arch 
+install-arch: build-arch-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs -a
-
 	$(MAKE) install DESTDIR=$(TMPPKG)
-
 	# fix totaly broken location of the include files;
 	# while at it, also avoid namespace collision, and move
 	# lots of admin-only/system-only stuff to sbin and lib
@@ -232,13 +227,11 @@
 	mkdir -p $(TMPPKG)/usr/include
 	mv $(TMPPKG)/usr/share/include/cyrus $(TMPPKG)/usr/include
 	#mv $(TMPPKG)/bin/* $(TMPPKG)/usr/bin
-
 	# Move the perl crap to a saner place
 	mkdir -p $(TMPPKG)/usr/lib
 	mkdir -p $(TMPPKG)/usr/share/perl5
 	#mv $(TMPPKG)/lib/perl5/Cyrus $(TMPPKG)/usr/share/perl5/Cyrus
 	#mv $(TMPPKG)/lib/* $(TMPPKG)/usr/lib
-
 	# for stuff in /etc
 	mkdir -p $(TMPPKG)/etc/cyrus $(TMPPKG)/etc/pam.d
 	install -m 644 debian/imapd.conf    $(TMPPKG)/etc
@@ -246,37 +239,30 @@
 	(cd debian ; for i in *.pam ;\
 		do install -m 644 $$i $(TMPPKG)/etc/pam.d/$${i%.pam} ;\
 	done)
-
 	# We rename some utils, so we need to sort out the manpages
 	for i in master reconstruct quota deliver ; do \
 		mv $(TMPPKG)/usr/share/man/man8/$$i.8 $(TMPPKG)/usr/share/man/man8/cyr$${i}.8 ; \
 	done
-
 	# And add our own manpages
 	mkdir -p $(TMPPKG)/usr/share/man/man8
 	install -m 644 debian/cyrdump.8 $(TMPPKG)/usr/share/man/man8/cyrdump.8
 	install -m 644 debian/cyrus-makedirs.8 $(TMPPKG)/usr/share/man/man8/cyrus-makedirs.8
 	install -m 644 debian/arbitronsort.8 $(TMPPKG)/usr/share/man/man8/arbitronsort.8
-
 	# SNMP files
 	mkdir -p $(TMPPKG)/usr/share/snmp/mibs
 	install -m 644 master/CYRUS-MASTER.mib $(TMPPKG)/usr/share/snmp/mibs/CYRUS-MASTER-MIB.txt
-
 	# Install cyradm icons
 	mkdir -p $(TMPPKG)/usr/share/icons/mini
 	install -m 644 debian/cyradm-32x32.xpm $(TMPPKG)/usr/share/icons/cyradm.xpm
 	install -m 644 debian/cyradm-16x16.xpm $(TMPPKG)/usr/share/icons/mini/cyradm.xpm
-
 	# Install debian-provided scripts
 	install debian/cyrus-makedirs $(TMPPKG)/usr/sbin/cyrus-makedirs
 	install -m 644 debian/get-backtrace.gdb $(TMPPKG)/usr/lib/cyrus/get-backtrace.gdb
-
 	# and logcheck files
 	install -m 644 debian/logcheck.ignore \
 	  $(PKGDIR)/etc/logcheck/ignore.d.server/cyrus2_3
 	install -m 644 debian/logcheck.violations.ignore \
 	  $(PKGDIR)/etc/logcheck/violations.ignore.d/cyrus2_3
-
 	# Install the stuff needed for upgrades
 	for i in convert-sieve.pl dohash rehash undohash translatesieve \
 		 upgradesieve masssievec; do \
@@ -288,7 +274,6 @@
 		   $(PKGDIR)/usr/lib/cyrus
 	# And other misc useful tools
 	install -m 755 tools/arbitronsort.pl $(TMPPKG)/usr/sbin/arbitronsort
-
 	# Install imtest and its symlinks
 	mv $(TMPPKG)/usr/bin/imtest $(CURDIR)/debian/cyrus-clients-2.3/usr/bin
 	for i in $(TMPPKG)/usr/bin/*test ; do \
@@ -296,7 +281,6 @@
 		(cd $(CURDIR)/debian/cyrus-clients-2.3/usr/bin &&\
 		 ln -s imtest `basename $$i`) ;\
 	done
-
 	# Lintian and Linda overrides
 	cd debian ; \
 	for i in *.linda ; do \
@@ -307,35 +291,34 @@
 		mkdir -p "$${i%%.lintian}/usr/share/lintian/overrides" ;\
 		install  -m 644 "$$i" "$${i%%.lintian}/usr/share/lintian/overrides/$${i%%.lintian}" ;\
 	done
-
 	dh_install -a --sourcedir=$(TMPPKG)
 	touch install-arch-stamp
 
 # We aren't actually able to install arch-indep independently from
 # arch-dep, so we guarantee that the arch build has been done first
-install-indep: build-indep install-arch
+install-indep: build-indep-stamp install-arch
 	dh_testdir
 	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/cyrus-common-2.3.contrib -rti cp -r '{}' $(DOCDIR)/contrib
-
+	#
 	dh_install -i --sourcedir=$(TMPPKG)
 
 binary-indep: install-indep




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