[Pkg-mailman-hackers] Pkg-mailman commit - rev 383 - trunk/debian

[Thijs Kinkhorst]

Author: thijs
Date: 2006-09-19 21:25:58 +0000 (Tue, 19 Sep 2006)
New Revision: 383

Modified:
   trunk/debian/mailman.dirs
   trunk/debian/rules
Log:
split building of arch-dep and arch-indep packages; we need to move
the "make doinstall" to the build target however since that will install
both arch-dep and arch-indep files we need in either targets.


Modified: trunk/debian/mailman.dirs
===================================================================
--- trunk/debian/mailman.dirs	2006-09-19 21:16:07 UTC (rev 382)
+++ trunk/debian/mailman.dirs	2006-09-19 21:25:58 UTC (rev 383)
@@ -1,3 +1,4 @@
+etc/mailman
 usr/lib/mailman
 usr/sbin
 usr/share/lintian/overrides

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-09-19 21:16:07 UTC (rev 382)
+++ trunk/debian/rules	2006-09-19 21:25:58 UTC (rev 383)
@@ -25,6 +25,12 @@
 build: patch build-stamp
 build-stamp: Makefile debian/po/templates.pot
 	$(MAKE) 
+	# install here since it's needed by both arch-dep and arch-indep packages.
+	dh_installdirs
+	$(MAKE) doinstall prefix=$$(pwd)/debian/mailman/var/lib/$(package) \
+		var_prefix=$$(pwd)/debian/mailman/var/lib/$(package) \
+		icondir=$$(pwd)/debian/mailman-common/usr/share/images/mailman \
+		ICONDIR=$$(pwd)/debian/mailman-common/usr/share/images/mailman
 	touch build-stamp
 
 debian/po/templates.pot: debian/templates
@@ -51,22 +57,26 @@
 	chmod +x debian/{prerm,postinst}
 
 binary-indep:	checkroot build
-	dh_testdir
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
+	dh_install -i
+	dh_installdocs -i
+	dh_installchangelogs -i
 
+	install -m 0644 debian/mm_cfg.py debian/mailman-common/usr/lib/mailman/Mailman/mm_cfg.py.dist
 
+	dh_installlogrotate -i --name=mailman
+	dh_installman -i
+	dh_installinit -i --name=mailman
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
 binary-arch:	checkroot build
-	dh_testdir
-	dh_install
-	dh_installdirs
-	dh_installdocs ACKNOWLEDGMENTS README* TODO FAQ
-	dh_installchangelogs NEWS
-	$(MAKE) doinstall prefix=$$(pwd)/debian/mailman/var/lib/$(package) \
-		var_prefix=$$(pwd)/debian/mailman/var/lib/$(package) \
-		icondir=$$(pwd)/debian/mailman-common/usr/share/images/mailman \
-		ICONDIR=$$(pwd)/debian/mailman-common/usr/share/images/mailman
+	dh_install -a
+	dh_installdocs -a ACKNOWLEDGMENTS README* TODO FAQ
+	dh_installchangelogs -a NEWS
 
 	#rmdir debian/$(package)/var/lib/mailman/pythonlib
 
@@ -79,7 +89,6 @@
 		mv $$i ../../../usr/lib/$(package); \
 	   done
 
-
 	# link them back to /var/lib/mailman
 	for i in debian/mailman/usr/lib/$(package)/*; do \
 	   dh_link usr/lib/$(package)/`basename $$i` var/lib/$(package)/`basename $$i`; \
@@ -111,10 +120,6 @@
 	# link it back to /var/lib/mailman/locks
 	dh_link var/lock/mailman var/lib/$(package)/locks
 
-	dh_installlogrotate --name=mailman
-
-	install -m 0644 debian/mm_cfg.py debian/mailman-common/usr/lib/mailman/Mailman/mm_cfg.py.dist
-
 	rm debian/$(package)/usr/lib/$(package)/Mailman/mm_cfg.py
 	dh_link etc/$(package)/mm_cfg.py \
 		usr/lib/$(package)/Mailman/mm_cfg.py
@@ -122,12 +127,10 @@
 	for bin in $(binaries); \
 		do dh_link usr/lib/$(package)/bin/$$bin usr/sbin/$$bin; done
 	mv debian/mailman/usr/sbin/arch debian/mailman/usr/sbin/mmarch
-	dh_installman
-	dh_installinit --name=mailman
-	dh_installdebconf
-	dh_strip
-	dh_compress
-	dh_fixperms
+	dh_installdebconf -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
 	chown -R root:root debian/mailman debian/mailman-common
 	chown -R root:list \
 		debian/mailman/{etc/$(package),var/lib/$(package),usr/lib/{$(package),cgi-bin/$(package)}}
@@ -176,7 +179,7 @@
 	chmod 2775 debian/mailman/var/log/mailman
 	chmod g+w debian/mailman/var/lock/mailman
 
-	dh_installdeb
+	dh_installdeb -a
 
 #	echo 'if [ "$$1" = purge ]; then' >> debian/mailman.postrm.ucf
 #	for f in `cat debian/ucffiles`; do \
@@ -199,10 +202,10 @@
 #	perl -pi -e '/#UCF#/ and do { open F, "debian/mailman.postinst.ucf"; local $$/ ; $$_ = <F> };' debian/mailman/DEBIAN/postinst
 #	perl -pi -e '/#UCF#/ and do { open F, "debian/mailman.postrm.ucf"; local $$/ ; $$_ = <F> };' debian/mailman/DEBIAN/postrm
 
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 
 # Below here is fairly generic really