[Pkg-nagios-changes] [pkg-nagios] r1978 - nagiosgrapher/trunk/debian

[Alexander Reichle-Schmehl]

tags 603456 pending
thanks

Author: tolimar
Date: 2011-12-03 12:03:25 +0000 (Sat, 03 Dec 2011)
New Revision: 1978

Modified:
   nagiosgrapher/trunk/debian/changelog
   nagiosgrapher/trunk/debian/rules
Log:
Import changes from last NMU



Modified: nagiosgrapher/trunk/debian/changelog
===================================================================
--- nagiosgrapher/trunk/debian/changelog	2011-11-01 16:12:25 UTC (rev 1977)
+++ nagiosgrapher/trunk/debian/changelog	2011-12-03 12:03:25 UTC (rev 1978)
@@ -1,3 +1,14 @@
+nagiosgrapher (1.7.1-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/rules: install standard//check_disk.ncfg
+    standard//check_swap.ncfg standard//check_ping.ncfg
+    standard//check_load.ncfg standard//check_procs.ncfg via ucf instead of
+    directly in the package (as it was done before) (Closes: #603456)
+  * Set urgency to medium due to rc bug fix
+
+ -- Alexander Reichle-Schmehl <tolimar at debian.org>  Fri, 26 Nov 2010 17:29:27 +0100
+
 nagiosgrapher (1.7.1-2) unstable; urgency=low
 
   [ Hendrik Frenzel ]

Modified: nagiosgrapher/trunk/debian/rules
===================================================================
--- nagiosgrapher/trunk/debian/rules	2011-11-01 16:12:25 UTC (rev 1977)
+++ nagiosgrapher/trunk/debian/rules	2011-12-03 12:03:25 UTC (rev 1978)
@@ -33,6 +33,25 @@
 	cp debian/commands.cfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/nagios3/
 	
 	# install service perf. templates
+	echo "List $(PKG_TMP)"
+	ls $(PKG_TMP)
+	echo "List $(PKG_TMP)/etc/"
+	ls $(PKG_TMP)/etc/
+	echo "List $(PKG_TMP)/etc/$(PKG)"
+	ls $(PKG_TMP)/etc/$(PKG)
+	echo "List $(PKG_TMP)/etc/$(PKG)/ngraph.d/"
+	ls $(PKG_TMP)/etc/$(PKG)/ngraph.d/
+	echo "$(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/"
+	ls $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/
+	echo "$(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard"
+	ls $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/
+	tmpl_cfgs="standard//check_disk.ncfg standard//check_swap.ncfg standard//check_ping.ncfg standard//check_load.ncfg standard//check_procs.ncfg standard//check_users.ncfg" \
+	mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_disk.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_disk.ncfg; \
+	mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_swap.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_swap.ncfg; \
+	mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_ping.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_ping.ncfg; \
+	mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_load.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_load.ncfg; \
+	mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_procs.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_procs.ncfg; \
+	mv $(PKG_TMP)/etc/$(PKG)/ngraph.d/templates/standard/check_users.ncfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/standard/check_users.ncfg; \
 	tmpl_root=$(PKG_TMP)/etc/$(PKG)/ngraph.d/templates; \
 	for tmpl_dir in $(TMPL_DIR); do \
 		for tmpl in $$tmpl_root/$$tmpl_dir/*.ncfg_disabled; do \