[SVN] r765 - in /trunk/cyrus-imapd-2.2.13/debian: changelog rules

debian at incase.de debian at incase.de
Wed Sep 24 08:26:49 UTC 2008 

Author: sven
Date: Wed Sep 24 10:26:49 2008
New Revision: 765

URL: https://mail.incase.de/viewcvs?rev=765&root=cyrus22&view=rev
Log:
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.

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

Modified: trunk/cyrus-imapd-2.2.13/debian/changelog
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/changelog?rev=765&root=cyrus22&r1=764&r2=765&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.13/debian/changelog Wed Sep 24 10:26:49 2008
@@ -2,8 +2,11 @@
 
   * change shebang line of example script mbox2cyrus to using /bin/bash
     instead of /bin/sh (Closes: #489558)
-
- -- Sven Mueller <sven at debian.org>  Tue, 15 Apr 2008 13:20:43 +0200
+  * 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
+
+ -- Sven Mueller <sven at debian.org>  Wed, 24 Sep 2008 10:24:08 +0200
 
 cyrus-imapd-2.2 (2.2.13-14) unstable; urgency=low
 

Modified: trunk/cyrus-imapd-2.2.13/debian/rules
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/rules?rev=765&root=cyrus22&r1=764&r2=765&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/rules (original)
+++ trunk/cyrus-imapd-2.2.13/debian/rules Wed Sep 24 10:26:49 2008
@@ -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) \
@@ -161,7 +161,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
@@ -174,7 +174,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 \
@@ -182,15 +182,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 &&\
@@ -203,17 +201,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 colision, and move
 	# lots of admin-only/system-only stuff to sbin and lib
@@ -233,13 +228,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
@@ -247,37 +240,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/logcheck-cyrus2_2
 	install -m 644 debian/logcheck.violations.ignore \
 	  $(PKGDIR)/etc/logcheck/violations.ignore.d/logcheck-cyrus2_2
-
 	# Install the stuff needed for upgrades
 	for i in convert-sieve.pl dohash rehash undohash translatesieve \
 		 upgradesieve masssievec; do \
@@ -289,7 +275,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.2/usr/bin
 	for i in $(TMPPKG)/usr/bin/*test ; do \
@@ -297,7 +282,6 @@
 		(cd $(CURDIR)/debian/cyrus-clients-2.2/usr/bin &&\
 		 ln -s imtest `basename $$i`) ;\
 	done
-
 	# Lintian and Linda overrides
 	cd debian ; \
 	for i in *.linda ; do \
@@ -308,35 +292,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.2.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