[Pkg-nagios-changes] [pkg-nagios] r1621 - nagios3/trunk/debian

[Alexander Wirt]

tags 513905 pending
tags 515289 pending
thanks

Author: formorer
Date: 2009-03-12 05:24:22 +0000 (Thu, 12 Mar 2009)
New Revision: 1621

Modified:
   nagios3/trunk/debian/changelog
   nagios3/trunk/debian/control
   nagios3/trunk/debian/nagios3-common.postinst
Log:
- Call ucf with --debconf-ok
- Depend on ucf >= 0.28


Modified: nagios3/trunk/debian/changelog
===================================================================
--- nagios3/trunk/debian/changelog	2009-03-12 05:11:20 UTC (rev 1620)
+++ nagios3/trunk/debian/changelog	2009-03-12 05:24:22 UTC (rev 1621)
@@ -2,8 +2,10 @@
 
   * Fix syntax error in nagios3-common.prerm 
     (Closes: #519341, #514168, #518884)
+  * Call ucf with --debconf-ok in nagios3-common.postrm. 
+    Depend on ucf >= for this "feature" (Closes: #513905, #515289)
 
- -- Alexander Wirt <formorer at debian.org>  Thu, 12 Mar 2009 06:08:53 +0100
+ -- Alexander Wirt <formorer at debian.org>  Thu, 12 Mar 2009 06:22:26 +0100
 
 nagios3 (3.0.6-3) unstable; urgency=low
 

Modified: nagios3/trunk/debian/control
===================================================================
--- nagios3/trunk/debian/control	2009-03-12 05:11:20 UTC (rev 1620)
+++ nagios3/trunk/debian/control	2009-03-12 05:24:22 UTC (rev 1621)
@@ -13,7 +13,7 @@
 
 Package: nagios3-common
 Architecture: all
-Depends: nagios-plugins-basic, nagios3-doc, coreutils (>= 4.5.3), bsd-mailx | mailx, adduser, lsb-base (>= 3.0-3), ucf, apache2-utils, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}
+Depends: nagios-plugins-basic, nagios3-doc, coreutils (>= 4.5.3), bsd-mailx | mailx, adduser, lsb-base (>= 3.0-3), ucf (>= 0.28), apache2-utils, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}
 Recommends: apache2 | httpd, nagios-plugins, nagios-images (>> 0.1)
 Description: support files for nagios3
  Nagios is a monitoring and management system for hosts, services and

Modified: nagios3/trunk/debian/nagios3-common.postinst
===================================================================
--- nagios3/trunk/debian/nagios3-common.postinst	2009-03-12 05:11:20 UTC (rev 1620)
+++ nagios3/trunk/debian/nagios3-common.postinst	2009-03-12 05:24:22 UTC (rev 1621)
@@ -52,9 +52,9 @@
 
 	# register apache2.conf via ucf:
 	if [ "$nagiosone" = "true" ]; then
-		ucf /usr/share/doc/nagios3-common/examples/apache2.nagios1.conf $apacheconf
+		ucf --debconf-ok /usr/share/doc/nagios3-common/examples/apache2.nagios1.conf $apacheconf
 	else
-		ucf /usr/share/doc/nagios3-common/examples/apache2.conf $apacheconf
+		ucf --debconf-ok /usr/share/doc/nagios3-common/examples/apache2.conf $apacheconf
 	fi
 
 	# and do some voodoo to detect default gw and make a host of it
@@ -67,7 +67,7 @@
 	fi
 	sed -e "s,GW,$DEFAULTGW," $usn/debian/gateway.cfg > $tmpgw
 	chmod 644 $tmpgw
-	ucf $tmpgw $enc/host-gateway_nagios3.cfg
+	ucf --debconf-ok $tmpgw $enc/host-gateway_nagios3.cfg
 
 	# this is where the debconf-ized external command support would go
 	#ucf $usn/debian/extcommands.cfg $enc/extcommands-nagios3.cfg