X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=51098b3304d94da10482a3cbae387f25e3f35158;hb=bccfaa1137ee987c762ed293ae738510fe54f72e;hp=46da9ce88d2ae65b0cca8c26fcb2d3ed75669a1f;hpb=49f286f6205a82e72bc79f6962c7048c0da81744;p=pkg-pnp4nagios.git

diff --git a/debian/rules b/debian/rules
index 46da9ce..51098b3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,11 @@ config.status: configure
 				--with-httpd-conf=/etc/apache2/conf.d \
 				CFLAGS="$(CFLAGS)"
 
-build: build-stamp
+build: build-arch build-indep
+
+build-arch: build-stamp
+
+build-indep: build-stamp
 
 build-stamp: $(QUILT_STAMPFN) config.status
 	dh_testdir
@@ -70,6 +74,7 @@ clean: unpatch
 	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean
+	rm -f scripts/rrd_modify.pl
 	debconf-updatepo
 
 install: build
@@ -117,6 +122,9 @@ install: build
 	cp -av contrib/ssi debian/tmp/usr/share/doc/pnp4nagios/examples/
 	rm -fv debian/tmp/usr/share/doc/pnp4nagios/examples/ssi/*.in
 
+	# Icinga module sample configuration
+	cp debian/icinga-module.cfg debian/tmp/usr/share/doc/pnp4nagios/examples/
+
 	# Remove external PHP classes/libraries: FPDF, FPDF-TPL, FPDI
 	rm -r debian/tmp/usr/share/pnp4nagios/html/application/vendor/fpdf
 
@@ -137,6 +145,10 @@ install: build
 
 	cp -av sample-config/httpd.conf debian/tmp/etc/pnp4nagios/apache.conf
 
+	# Remove unnecessary config files (duplicates)
+	rm -f debian/tmp/etc/pnp4nagios/config_local.php
+	rm -f debian/tmp/etc/pnp4nagios/config.php.0.6*
+
 	# Add subdirs to /var/spool/pnp4nagios/ to prepare for different modes
 	mkdir debian/tmp/var/spool/pnp4nagios/nagios
 	mkdir debian/tmp/var/spool/pnp4nagios/npcd
@@ -147,6 +159,9 @@ install: build
 	rmdir debian/tmp/usr/share/pnp4nagios/html/application/hooks/
 	#rmdir debian/tmp/usr/share/pnp4nagios/html/application/libraries/
 
+	mkdir debian/tmp/etc/pnp4nagios/templates.d
+	cp debian/README.templates.d debian/tmp/etc/pnp4nagios/templates.d/README
+
 	dh_install --sourcedir=debian/tmp --fail-missing
 
 # Build architecture-independent files here.
@@ -176,7 +191,8 @@ binary-arch: build install
 	dh_installexamples -a
 	dh_installdebconf -a
 	dh_installinit -ppnp4nagios-bin --name=npcd
-	dh_installman -a man/npcd.8
+	dh_installinit -ppnp4nagios-bin --name=pnp_gearman_worker
+	dh_installman -a
 	dh_link -a
 	dh_strip -a
 	dh_compress -a