* debian/rules: packaged missing dirs

* postinst: moved db_stop after ucf is executed

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

diff --git a/debian/changelog b/debian/changelog
index 27da0572d3ca62635419de6bd3686c2f9f638575..cd346f2514ca932e673861dd71aafc789321937c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nagvis (1:1.2.2-2) UNRELEASED; urgency=low
+
+  * debian/rules
+    + packed missing directories (Closes: #470635: nagvis deb package is not
+      complete)
+  * postinst:
+    + moved debconfs db_stop after ucf is executed
+
+ -- Hendrik Frenzel <hfrenzel@scunc.net>  Wed, 12 Mar 2008 16:45:22 +0100
+
 nagvis (1:1.2.2-1) unstable; urgency=low
 
   * New upstream release with major bugfixes:

diff --git a/debian/postinst b/debian/postinst
index 384df73558064a6fbe6b4cc90bde2a29c978ed82..8b4b9a4ca77dd6627e3547aa6f801a2eddf635cc 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -13,7 +13,6 @@ if [ -f /usr/share/dbconfig-common/dpkg/frontend.postinst.mysql ]; then
        dbc_generate_include_args='--ucf -o template_infile=/usr/share/nagvis/debian/nagvis.ini.php-sample'
        dbc_go nagvis $@
 fi
-db_stop
 
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
@@ -66,6 +65,7 @@ case "$1" in
     ;;
 esac
 
+db_stop
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 

diff --git a/debian/rules b/debian/rules
index 99acb3d853c5c73c4ea8636baf8d628b42d02c71..2857b618c2f86a08657d9d7b21a8739d9b0c6696 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,13 +48,13 @@ install: build
         mv $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample.new \
            $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample
        
-       cp -a nagvis/includes/classes $(DEST)/usr/share/nagvis/includes/
-       cp -a nagvis/includes/defines $(DEST)/usr/share/nagvis/includes/
+       for dir in classes defines functions languages; do \
+               cp -a nagvis/includes/$$dir $(DEST)/usr/share/nagvis/includes/; \
+       done
        
        cp -a nagvis/images $(DEST)/usr/share/nagvis/htdocs/nagvis/
        cp -a nagvis/includes/css $(DEST)/usr/share/nagvis/htdocs/nagvis/
        cp -a nagvis/includes/js $(DEST)/usr/share/nagvis/htdocs/nagvis/
-       cp -a nagvis/includes/languages $(DEST)/usr/share/nagvis/htdocs/nagvis/
        
        cp -a nagvis/*.php $(DEST)/usr/share/nagvis/htdocs/nagvis/