[Pkg-nagios-changes] [SCM] debian packaging of PNP4Nagios branch, master, updated. v_0_6_13-1-20-g4769146

[Sebastian Harl]

The following commit has been merged in the master branch:
commit 47691461a7a618bb84222ed1d3863a4f38932d66
Author: Sebastian Harl <sh at teamix.net>
Date:   Thu Jun 14 11:56:40 2012 +0200

    pnp4nagios.postrm: Fixed typo: Apache's config files use file suffix .conf.
    
    … rather than .cfg; this prevented /etc/apache2/conf.d/pnp4nagios.conf from
    being removed on remove/purge; thanks to Andreas Beckmann for reporting this.
    cf. #669839

diff --git a/debian/changelog b/debian/changelog
index c5f5d0f..35772a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pnp4nagios (0.6.16-2) unstable; urgency=low
+
+  * debian/pnp4nagios.postrm:
+    - Fixed typo: Apache's config files use file suffix .conf rather than
+      .cfg; this prevented /etc/apache2/conf.d/pnp4nagios.conf from being
+      removed on remove/purge; thanks to Andreas Beckmann for reporting this
+      (cf. #669839).
+
+ -- Sebastian Harl <tokkee at debian.org>  Tue, 24 Apr 2012 14:44:33 +0200
+
 pnp4nagios (0.6.16-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/pnp4nagios-web.postrm b/debian/pnp4nagios-web.postrm
index 40781ab..5b0a21a 100644
--- a/debian/pnp4nagios-web.postrm
+++ b/debian/pnp4nagios-web.postrm
@@ -22,10 +22,10 @@ set -e
 case "$1" in
 	purge|remove)
 		if [ -d /etc/apache2/conf.d/ ]; then
-			if [ -L /etc/apache2/conf.d/pnp4nagios.cfg ]; then
-				ls -l /etc/apache2/conf.d/pnp4nagios.cfg | grep -q /etc/pnp4nagios/apache.cfg
+			if [ -L /etc/apache2/conf.d/pnp4nagios.conf ]; then
+				ls -l /etc/apache2/conf.d/pnp4nagios.conf | grep -q /etc/pnp4nagios/apache.conf
 				if [ $? -eq 0 ]; then
-					rm -f /etc/apache2/conf.d/pnp4nagios.cfg
+					rm -f /etc/apache2/conf.d/pnp4nagios.conf
 				fi
 			fi
 		fi

-- 
debian packaging of PNP4Nagios