rules: Do not install config_local.php and config.php.$PKG_VERSION.

diff --git a/debian/changelog b/debian/changelog
index d5e228a75fd679eec6916259a2e3fe4d903d9584..2022d91b3108f5670c82c762f8cded00e3a5da8d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,11 +11,12 @@ pnp4nagios (0.6.12-1) unstable; urgency=low
       prefix is set by layout=debian and cannot be overwritten, thus do not
       pretend this is possible. Also, do not use $prefix when setting man-/
       infodir but specify the complete path.
+    - Do not install config_local.php and config.php.$PKG_VERSION.
   * debian/rules, debian/pnp4nagios-bin.install:
     - Do not install npcd.8 using dh_installman; this is done by the upstream
       Makefile now.
 
- -- Sebastian Harl <tokkee@debian.org>  Tue, 26 Apr 2011 13:50:53 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 26 Apr 2011 14:25:01 +0200
 
 pnp4nagios (0.6.11-2) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index f2ecca32b42bb6148aa5bd191223621f03e3a15f..149f56eef60942afbf0dd248a09a897bedc514f6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -137,6 +137,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