[Pkg-nagios-changes] [pkg-nagios] r1653 - nagvis/trunk/debian

[Hendrik Frenzel]

tags 522172 pending
tags 522296 pending
thanks

Author: hfrenzel-guest
Date: 2009-04-15 14:47:26 +0000 (Wed, 15 Apr 2009)
New Revision: 1653

Modified:
   nagvis/trunk/debian/changelog
   nagvis/trunk/debian/postinst
   nagvis/trunk/debian/postrm
   nagvis/trunk/debian/rules
Log:
bugs fixed

Modified: nagvis/trunk/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog	2009-04-04 08:41:26 UTC (rev 1652)
+++ nagvis/trunk/debian/changelog	2009-04-15 14:47:26 UTC (rev 1653)
@@ -1,3 +1,10 @@
+nagvis (1:1.3.1-2) unstable; urgency=low
+  
+  * Added --debconf-ok to debian/post{inst,rm} (Closes: 522172)
+  * Copy wui/includes/functions to the right directory (Closes: 522296)
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Wed, 15 Apr 2009 15:54:05 +0200
+
 nagvis (1:1.3.1-1) unstable; urgency=low
 
   * New upstream version with many new features and bugfixes

Modified: nagvis/trunk/debian/postinst
===================================================================
--- nagvis/trunk/debian/postinst	2009-04-04 08:41:26 UTC (rev 1652)
+++ nagvis/trunk/debian/postinst	2009-04-15 14:47:26 UTC (rev 1653)
@@ -50,7 +50,7 @@
 	setperm www-data www-data 0775 /usr/share/nagvis/htdocs/nagvis/etc/maps
 	setperm www-data www-data 0755 /var/lib/nagvis
 
-	ucf /usr/share/nagvis/debian/apache.conf /etc/nagvis/apache.conf
+	ucf --debconf-ok /usr/share/nagvis/debian/apache.conf /etc/nagvis/apache.conf
 	#if [ ! -f /etc/apache2/conf.d/nagvis.conf ]; then
 	#	ln -s /etc/nagvis/apache.conf /etc/apache2/conf.d/nagvis.conf
 	#fi

Modified: nagvis/trunk/debian/postrm
===================================================================
--- nagvis/trunk/debian/postrm	2009-04-04 08:41:26 UTC (rev 1652)
+++ nagvis/trunk/debian/postrm	2009-04-15 14:47:26 UTC (rev 1653)
@@ -41,7 +41,7 @@
 if [ "$1" = "purge" ]; then
 	for file in apache.conf nagvis.ini.php; do
 		rm -f /etc/nagvis/$file
-		ucf --purge /etc/nagvis/$file
+		ucf --debconf-ok --purge /etc/nagvis/$file
 	done
 
 	#if [ -e /etc/apache2/conf.d/nagvis.conf ]; then

Modified: nagvis/trunk/debian/rules
===================================================================
--- nagvis/trunk/debian/rules	2009-04-04 08:41:26 UTC (rev 1652)
+++ nagvis/trunk/debian/rules	2009-04-15 14:47:26 UTC (rev 1653)
@@ -68,6 +68,7 @@
 	cp -a wui/includes/classes $(DEST)/usr/share/nagvis/wui/includes/
 	cp -a wui/includes/css $(DEST)/usr/share/nagvis/htdocs/wui/
 	cp -a wui/includes/js $(DEST)/usr/share/nagvis/htdocs/wui/
+	cp -a wui/includes/functions $(DEST)/usr/share/nagvis/htdocs/wui/includes/
 	cp -a wui/*.php $(DEST)/usr/share/nagvis/htdocs/wui/
 	cp -a *.php $(DEST)/usr/share/nagvis/htdocs/