X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=18526be703c6733a766efdd72f88cf22358f0b1e;hb=c29cae7846d23f0e5c801bdb612d37d254a98897;hp=13dc456a2a4ff88aa457a9be493970971b5a5dee;hpb=d0d7fd6e435cc7268c6f7551c5d526f620e5bee0;p=pkg-pnp4nagios.git

diff --git a/debian/rules b/debian/rules
index 13dc456..18526be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,11 +32,10 @@ config.status: configure
 
 	./configure $(CROSS) \
 				--with-layout=debian \
-				--prefix=/usr \
-				--mandir=\$${prefix}/share/man \
-				--infodir=\$${prefix}/share/info \
+				--mandir=/usr/share/man \
+				--infodir=/usr/share/info \
 				--without-kohana \
-				--with-kohana_system=/usr/share/php/kohana/system \
+				--with-kohana_system=/usr/share/php/kohana2/system \
 				--with-httpd-conf=/etc/apache2/conf.d \
 				CFLAGS="$(CFLAGS)"
 
@@ -70,7 +69,10 @@ clean: unpatch
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 
+	rm -f scripts/rc.pnp_gearman_worker
+
 	dh_clean
+	debconf-updatepo
 
 install: build
 	dh_testdir
@@ -96,11 +98,6 @@ install: build
 	mkdir -p debian/tmp/usr/sbin/
 	mv debian/tmp/usr/bin/npcd \
 		debian/tmp/usr/sbin/
-	mv debian/tmp/etc/pnp4nagios/npcd.cfg-sample \
-		debian/tmp/etc/pnp4nagios/npcd.cfg
-
-	mv debian/tmp/etc/pnp4nagios/process_perfdata.cfg-sample \
-		debian/tmp/etc/pnp4nagios/process_perfdata.cfg
 
 	mv debian/tmp/etc/pnp4nagios/rra.cfg-sample \
 		debian/tmp/etc/pnp4nagios/rra.cfg
@@ -142,6 +139,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
@@ -159,8 +160,9 @@ binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -i ChangeLog
-	dh_installdocs -A -i AUTHORS README README.Debian
+	dh_installdocs -A -i AUTHORS README debian/README.Debian
 	dh_installexamples -i
+	dh_installdebconf -i
 	dh_installinit -i
 	dh_installman -i
 	dh_link -i
@@ -176,10 +178,11 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -a ChangeLog
-	dh_installdocs -A -a AUTHORS README README.Debian
+	dh_installdocs -A -a AUTHORS README debian/README.Debian
 	dh_installexamples -a
-	dh_installinit -a
-	dh_installman -a man/npcd.8
+	dh_installdebconf -a
+	dh_installinit -ppnp4nagios-bin --name=npcd
+	dh_installman -a
 	dh_link -a
 	dh_strip -a
 	dh_compress -a