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

[Hendrik Frenzel]

tags 470635 pending
thanks

Author: hfrenzel-guest
Date: 2008-03-13 10:51:17 +0000 (Thu, 13 Mar 2008)
New Revision: 1376

Modified:
   nagvis/trunk/debian/changelog
   nagvis/trunk/debian/postinst
   nagvis/trunk/debian/rules
Log:
* debian/rules: packaged missing dirs
* postinst: moved db_stop after ucf is executed


Modified: nagvis/trunk/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog	2008-03-13 10:48:30 UTC (rev 1375)
+++ nagvis/trunk/debian/changelog	2008-03-13 10:51:17 UTC (rev 1376)
@@ -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 at 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:

Modified: nagvis/trunk/debian/postinst
===================================================================
--- nagvis/trunk/debian/postinst	2008-03-13 10:48:30 UTC (rev 1375)
+++ nagvis/trunk/debian/postinst	2008-03-13 10:51:17 UTC (rev 1376)
@@ -13,7 +13,6 @@
 	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 @@
     ;;
 esac
 
+db_stop
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 

Modified: nagvis/trunk/debian/rules
===================================================================
--- nagvis/trunk/debian/rules	2008-03-13 10:48:30 UTC (rev 1375)
+++ nagvis/trunk/debian/rules	2008-03-13 10:51:17 UTC (rev 1376)
@@ -48,13 +48,13 @@
 	 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/