bugs fixed

git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1653 98d490a6-b407-0410-aaaa-fdee166ba3f5

diff --git a/debian/changelog b/debian/changelog
index 8d28a060004ab72b06f49475092edd424f6e8f9e..5fc401e8fd9a1190d69e80116eaae7cc26d67d07 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@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

diff --git a/debian/postinst b/debian/postinst
index 761d1b2828390f8367c5ba0f46a7133542220d83..d5ff52d14606ac8a730fdd7f3e2506315c8ecc3b 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -50,7 +50,7 @@ case "$1" in
        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

diff --git a/debian/postrm b/debian/postrm
index 38815e7692c72b7061fd763a0ef685969fb9c0b3..3485a986fcb53f5cc664bd5e13da1ba3300c4caf 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -41,7 +41,7 @@ esac
 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

diff --git a/debian/rules b/debian/rules
index 09f1882d0aa01d17a3f963ec0adeceab9bb5161c..44a95fc8934b875db334797c790ad9f2088a5549 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -68,6 +68,7 @@ install: build
        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/