New upstream version 0.6.10

Signed-off-by: Sven Velt <sven@velt.de>

diff --git a/debian/changelog b/debian/changelog
index fef5c3c64632d8ec93299fea389f08caf69a5806..215b093e3d99e4df73423f4800d17638bc403138 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pnp4nagios (0.6.10-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Sven Velt <sven@velt.de>  Wed, 22 Dec 2010 10:04:32 +0000
+
 pnp4nagios (0.6.7-1) UNRELEASED; urgency=low
 
   * New upstream release

diff --git a/debian/rules b/debian/rules
old mode 100755 (executable)
new mode 100644 (file)
index 78facf3..38786c7
--- a/debian/rules
+++ b/debian/rules
@@ -79,12 +79,6 @@ install: build
 #      ln -s ../../../../etc/pnp4nagios/templates $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/templates
        dh_link /etc/pnp4nagios/templates /usr/share/pnp4nagios/html/templates
 
-       # Move npcd and npcdmod.o to right path
-       mv $(CURDIR)/debian/pnp4nagios/usr/bin/npcd \
-               $(CURDIR)/debian/pnp4nagios/usr/sbin/
-
-       rmdir $(CURDIR)/debian/pnp4nagios/usr/bin
-
        # Copy, rename and fix sample configs and examples
        sed -i -e 's#/nagios/cgi-bin#/cgi-bin/nagios3#' $(CURDIR)/debian/pnp4nagios/etc/pnp4nagios/config.php
 
@@ -133,6 +127,7 @@ install: build
        mkdir $(CURDIR)/debian/pnp4nagios/var/spool/pnp4nagios/npcd
 
        # Delete not used and empty directories
+       #rmdir $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/application/logs/
        rmdir $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/application/cache/
        rmdir $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/application/hooks/
        rmdir $(CURDIR)/debian/pnp4nagios/usr/share/pnp4nagios/html/application/libraries/