[Pkg-nagios-changes] [pkg-nagios] r988 - nagios/trunk/debian

[Sean Finney]

Author: seanius
Date: 2006-09-19 10:57:52 +0000 (Tue, 19 Sep 2006)
New Revision: 988

Modified:
   nagios/trunk/debian/changelog
   nagios/trunk/debian/nagios-mysql.config
   nagios/trunk/debian/nagios-mysql.postrm
   nagios/trunk/debian/nagios-pgsql.config
   nagios/trunk/debian/nagios-pgsql.postrm
Log:
policy fixes

Modified: nagios/trunk/debian/changelog
===================================================================
--- nagios/trunk/debian/changelog	2006-09-09 14:45:10 UTC (rev 987)
+++ nagios/trunk/debian/changelog	2006-09-19 10:57:52 UTC (rev 988)
@@ -1,12 +1,13 @@
-nagios (2:1.4-2) UNRELEASED; urgency=low
+nagios (2:1.4-2) unstable; urgency=low
 
-  * NOT RELEASED YET
   [sean finney]
   * clean up dependencies by removing transitional (pre-sarge) fileutils
     package (closes: #368721), thanks to Stefan Huehner.
   * new portuguese debconf translations from Rui Branco (closes: #384647).
+  * test for existance of dbconfig-common hooks before sourcing them
+    in the config/postrm scripts (closes: #388228, #388229).
 
- -- sean finney <seanius at debian.org>  Wed, 24 May 2006 17:50:18 +0200
+ -- sean finney <seanius at debian.org>  Tue, 19 Sep 2006 12:56:16 +0200
 
 nagios (2:1.4-1) unstable; urgency=high
 

Modified: nagios/trunk/debian/nagios-mysql.config
===================================================================
--- nagios/trunk/debian/nagios-mysql.config	2006-09-09 14:45:10 UTC (rev 987)
+++ nagios/trunk/debian/nagios-mysql.config	2006-09-19 10:57:52 UTC (rev 988)
@@ -1,7 +1,9 @@
 #!/bin/sh -e
 
 . /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/config.mysql 
-dbc_first_version="2:1.3-cvs.20050402-11"
-dbc_go nagios-mysql $@
+if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
+	. /usr/share/dbconfig-common/dpkg/config.mysql 
+	dbc_first_version="2:1.3-cvs.20050402-11"
+	dbc_go nagios-mysql $@
+fi
 

Modified: nagios/trunk/debian/nagios-mysql.postrm
===================================================================
--- nagios/trunk/debian/nagios-mysql.postrm	2006-09-09 14:45:10 UTC (rev 987)
+++ nagios/trunk/debian/nagios-mysql.postrm	2006-09-19 10:57:52 UTC (rev 988)
@@ -1,9 +1,12 @@
 #!/bin/sh -e
 
 . /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/postrm.mysql
-dbc_go nagios-mysql $@
 
+if [ -f /usr/share/dbconfig-common/dpkg/postrm.mysql ]; then
+	. /usr/share/dbconfig-common/dpkg/postrm.mysql
+	dbc_go nagios-mysql $@
+fi
+
 # stop the daemon if we're being removed
 if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
 	if [ -f /etc/init.d/nagios ]; then

Modified: nagios/trunk/debian/nagios-pgsql.config
===================================================================
--- nagios/trunk/debian/nagios-pgsql.config	2006-09-09 14:45:10 UTC (rev 987)
+++ nagios/trunk/debian/nagios-pgsql.config	2006-09-19 10:57:52 UTC (rev 988)
@@ -1,7 +1,9 @@
 #!/bin/sh -e
 
 . /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/config.pgsql 
-dbc_first_version="2:1.3-cvs.20050402-11"
-dbc_go nagios-pgsql $@
+if [ -f /usr/share/dbconfig-common/dpkg/config.pgsql ]; then
+	. /usr/share/dbconfig-common/dpkg/config.pgsql 
+	dbc_first_version="2:1.3-cvs.20050402-11"
+	dbc_go nagios-pgsql $@
+fi
 

Modified: nagios/trunk/debian/nagios-pgsql.postrm
===================================================================
--- nagios/trunk/debian/nagios-pgsql.postrm	2006-09-09 14:45:10 UTC (rev 987)
+++ nagios/trunk/debian/nagios-pgsql.postrm	2006-09-19 10:57:52 UTC (rev 988)
@@ -1,8 +1,10 @@
 #!/bin/sh -e
 
 . /usr/share/debconf/confmodule
-. /usr/share/dbconfig-common/dpkg/postrm.pgsql
-dbc_go nagios-pgsql $@
+if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql ]; then
+	. /usr/share/dbconfig-common/dpkg/postrm.pgsql
+	dbc_go nagios-pgsql $@
+fi
 
 # stop the daemon if we're being removed
 if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then