From: hfrenzel-guest <hfrenzel-guest@98d490a6-b407-0410-aaaa-fdee166ba3f5>
Date: Thu, 13 Mar 2008 10:51:17 +0000 (+0000)
Subject: * debian/rules: packaged missing dirs
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aab4999db0669effa8736bc6d8842fb4fdc50dd5;p=pkg-nagvis.git

* 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 27da057..cd346f2 100644
--- 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 384df73..8b4b9a4 100644
--- 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 99acb3d..2857b61 100755
--- 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/