[Pkg-nagios-changes] [pkg-nagios] r1979 - in nagiosgrapher/tags: . 1.7.1-2.1/debian

Alexander Reichle-Schmehl tolimar at alioth.debian.org
Sat Dec 3 12:03:49 UTC 2011


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

Added:
   nagiosgrapher/tags/1.7.1-2.1/
   nagiosgrapher/tags/1.7.1-2.1/debian/changelog
   nagiosgrapher/tags/1.7.1-2.1/debian/rules
Removed:
   nagiosgrapher/tags/1.7.1-2.1/debian/changelog
   nagiosgrapher/tags/1.7.1-2.1/debian/rules
Log:
[svn-buildpackage] Tagging nagiosgrapher 1.7.1-2.1

Deleted: nagiosgrapher/tags/1.7.1-2.1/debian/changelog
===================================================================
--- nagiosgrapher/trunk/debian/changelog	2011-11-01 16:12:25 UTC (rev 1977)
+++ nagiosgrapher/tags/1.7.1-2.1/debian/changelog	2011-12-03 12:03:49 UTC (rev 1979)
@@ -1,93 +0,0 @@
-nagiosgrapher (1.7.1-2) unstable; urgency=low
-
-  [ Hendrik Frenzel ]
-  * rrd2-graph.cgi:
-    fixed uninitialized value error in rrd2-graph.cgi (Closes: 536876)
-    fixed empty $end variable (Closes: 566248)
-  * removed duplicate logrotate config (Closes: 516076)
-  * added $remote_fs $syslog dependency to the init script
-  * removed empty var/run
-  * escaped minus sign in manpage
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 18 Feb 2010 16:58:26 +0100
-
-nagiosgrapher (1.7.1-1) unstable; urgency=low
-
-  [ Hendrik Frenzel ]
-  * packaged current stable upstream release (Closes: 514362, 565914)
-  * removed useless README (Closes: 495640)
-  * fixed graph_log_regex in templates/standard/check_smtp.ncfg to better match
-    the log output and changed graph_log_regex to graph_perf_regex in
-    templates/standard/check_http.ncfg according to check_imap.ncfg (Closes:
-    513969)
-  * changed order of setuid/setgid and added checks if those operations fail
-    and changed permission in create_pipe in collect2.pl from 0666 to 0660
-    (Closes: 483695)
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Sun, 15 Feb 2009 13:18:02 +0100
-
-nagiosgrapher (1.6.1rc5-6) unstable; urgency=low
-
-  * patched ignorance of comments into NagiosGrapher.pm (Closes: 466854)
-    + changed tags in ngraph.ncfg 
-      (see /usr/share/doc/nagiosgrapher/NEWS.Debian.gz)
-  * switched to nagios3 support (Closes: 479291)
-    + moved nagiosgraphers config for nagios3 to /etc/nagiosgrapher/nagios3
-      and symlinked to /etc/nagios3/conf.d/ngraph for inclusion
-  * debian/watch
-    + changed upstreams download URL
-    + removed unused comments
-  * debian/postrm.in
-    + purge ucf handled configs on package purge
-  * debian/copyright
-    + switched to format as proposed on 
-      http://wiki.debian.org/Proposals/CopyrightFormat
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 19 May 2008 22:51:09 +0200
-
-nagiosgrapher (1.6.1rc5-5) unstable; urgency=low
-
-  * patched clean and distclean targets to Makefile.in
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 21 Jan 2008 19:56:58 +0100
-
-nagiosgrapher (1.6.1rc5-4) unstable; urgency=low
-
-  * Fixed Vcs-* fields in debian/control
-  * update to Standards-Version to 3.7.3.
-  * enabled DM-Upload
-  * removed old Homepage stanza in debian/control
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 10 Jan 2008 00:59:43 +0100
-
-nagiosgrapher (1.6.1rc5-3) unstable; urgency=low
-
-  * Fixed example process-service-perfdata fifo_write command in README.Debian
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 18 Oct 2007 12:18:30 +0200
-
-nagiosgrapher (1.6.1rc5-2) unstable; urgency=low
-
-  * Fixed typo in logrotate script (Closes: #440149)
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 30 Aug 2007 17:17:08 +0200
-
-nagiosgrapher (1.6.1rc5-1) unstable; urgency=low
-
-  * New upstream release (Closes: #437124, #439777, #442042)
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Sat, 18 Aug 2007 00:31:55 +0200
-
-nagiosgrapher (1.6.1rc3-2) unstable; urgency=low
-
-  * Fixed some lintian warnings.
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 23 Jul 2007 22:03:14 +0200
-
-nagiosgrapher (1.6.1rc3-1) unstable; urgency=low
-
-  * Initial release (Closes: #401113: ITP: nagiosgrapher -- A graphing system for
-    the Nagios monitoring system project.)
-
- -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 16 Jul 2007 11:27:27 +0200
-

Copied: nagiosgrapher/tags/1.7.1-2.1/debian/changelog (from rev 1978, nagiosgrapher/trunk/debian/changelog)
===================================================================
--- nagiosgrapher/tags/1.7.1-2.1/debian/changelog	                        (rev 0)
+++ nagiosgrapher/tags/1.7.1-2.1/debian/changelog	2011-12-03 12:03:49 UTC (rev 1979)
@@ -0,0 +1,104 @@
+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 ]
+  * rrd2-graph.cgi:
+    fixed uninitialized value error in rrd2-graph.cgi (Closes: 536876)
+    fixed empty $end variable (Closes: 566248)
+  * removed duplicate logrotate config (Closes: 516076)
+  * added $remote_fs $syslog dependency to the init script
+  * removed empty var/run
+  * escaped minus sign in manpage
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 18 Feb 2010 16:58:26 +0100
+
+nagiosgrapher (1.7.1-1) unstable; urgency=low
+
+  [ Hendrik Frenzel ]
+  * packaged current stable upstream release (Closes: 514362, 565914)
+  * removed useless README (Closes: 495640)
+  * fixed graph_log_regex in templates/standard/check_smtp.ncfg to better match
+    the log output and changed graph_log_regex to graph_perf_regex in
+    templates/standard/check_http.ncfg according to check_imap.ncfg (Closes:
+    513969)
+  * changed order of setuid/setgid and added checks if those operations fail
+    and changed permission in create_pipe in collect2.pl from 0666 to 0660
+    (Closes: 483695)
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Sun, 15 Feb 2009 13:18:02 +0100
+
+nagiosgrapher (1.6.1rc5-6) unstable; urgency=low
+
+  * patched ignorance of comments into NagiosGrapher.pm (Closes: 466854)
+    + changed tags in ngraph.ncfg 
+      (see /usr/share/doc/nagiosgrapher/NEWS.Debian.gz)
+  * switched to nagios3 support (Closes: 479291)
+    + moved nagiosgraphers config for nagios3 to /etc/nagiosgrapher/nagios3
+      and symlinked to /etc/nagios3/conf.d/ngraph for inclusion
+  * debian/watch
+    + changed upstreams download URL
+    + removed unused comments
+  * debian/postrm.in
+    + purge ucf handled configs on package purge
+  * debian/copyright
+    + switched to format as proposed on 
+      http://wiki.debian.org/Proposals/CopyrightFormat
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 19 May 2008 22:51:09 +0200
+
+nagiosgrapher (1.6.1rc5-5) unstable; urgency=low
+
+  * patched clean and distclean targets to Makefile.in
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 21 Jan 2008 19:56:58 +0100
+
+nagiosgrapher (1.6.1rc5-4) unstable; urgency=low
+
+  * Fixed Vcs-* fields in debian/control
+  * update to Standards-Version to 3.7.3.
+  * enabled DM-Upload
+  * removed old Homepage stanza in debian/control
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 10 Jan 2008 00:59:43 +0100
+
+nagiosgrapher (1.6.1rc5-3) unstable; urgency=low
+
+  * Fixed example process-service-perfdata fifo_write command in README.Debian
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 18 Oct 2007 12:18:30 +0200
+
+nagiosgrapher (1.6.1rc5-2) unstable; urgency=low
+
+  * Fixed typo in logrotate script (Closes: #440149)
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Thu, 30 Aug 2007 17:17:08 +0200
+
+nagiosgrapher (1.6.1rc5-1) unstable; urgency=low
+
+  * New upstream release (Closes: #437124, #439777, #442042)
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Sat, 18 Aug 2007 00:31:55 +0200
+
+nagiosgrapher (1.6.1rc3-2) unstable; urgency=low
+
+  * Fixed some lintian warnings.
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 23 Jul 2007 22:03:14 +0200
+
+nagiosgrapher (1.6.1rc3-1) unstable; urgency=low
+
+  * Initial release (Closes: #401113: ITP: nagiosgrapher -- A graphing system for
+    the Nagios monitoring system project.)
+
+ -- Hendrik Frenzel <hfrenzel at scunc.net>  Mon, 16 Jul 2007 11:27:27 +0200
+

Deleted: nagiosgrapher/tags/1.7.1-2.1/debian/rules
===================================================================
--- nagiosgrapher/trunk/debian/rules	2011-11-01 16:12:25 UTC (rev 1977)
+++ nagiosgrapher/tags/1.7.1-2.1/debian/rules	2011-12-03 12:03:49 UTC (rev 1979)
@@ -1,58 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-#CFGS=ngraph.{,d/{nmgraph,extra/check_weather,standard/check_{procs,ping,pop,http,load,users}}.}ncfg
-CFGS := ngraph.ncfg ngraph.d/nmgraph.ncfg
-TMPL_DIR := extra/ standard/
-
-PKG:=nagiosgrapher
-PKG_TMP:=debian/$(PKG)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-#DEB_MAKE_ENVVARS := BUILD_ROOT=$(CURDIR)/debian/tmp LC_ALL=C
-#DEB_DH_INSTALL_SOURCEDIR := debian/tmp
-DEB_CONFIGURE_EXTRA_FLAGS := --with-layout=debian-patch --with-ng-srvext-dir=/etc/nagiosgrapher/nagios3/serviceext --with-ng-srvext-file=/etc/nagiosgrapher/nagios3/serviceext.cfg
-DEB_AUTO_UPDATE_AUTOCONF := 1 
-
-install/$(PKG)::
-	rm -f $(PKG_TMP)/usr/lib/$(PKG)/*.c
-	
-	for dir in $(TMPL_DIR); do \
-		mkdir -p $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/$$dir; \
-	done
-	
-	# install config templates
-	for cfg in $(CFGS); do \
-		mv $(PKG_TMP)/etc/$(PKG)/$$cfg* \
-		 $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/$$cfg; \
-	done
-	mkdir -p $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/nagios3
-	cp debian/commands.cfg $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/nagios3/
-	
-	# install service perf. templates
-	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 \
-			dest=`echo $$tmpl | sed "s#.*\($$tmpl_dir/.*\.ncfg\).*#\1#"`; \
-			mv $${tmpl} $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/$$dest; \
-			tmpl_cfgs="$$tmpl_cfgs $$dest"; \
-		done; \
-		mv $$tmpl_root/$$tmpl_dir $(PKG_TMP)/etc/$(PKG)/ngraph.d/; \
-	done; \
-	sed "s#@@CFGS@@#$(CFGS) nagios3/commands.cfg#g;s#@@TMPL_CFGS@@#$$tmpl_cfgs#g" < debian/postinst.in > debian/postinst
-	
-	# fix permissions
-	find $(PKG_TMP)/usr/share/nagiosgrapher/htdocs/images/ -type f -name "*.png" -print0 \
-		| xargs -0 chmod 0644 
-	chmod 0644 $(PKG_TMP)/usr/share/nagiosgrapher/debian/cfg/ngraph.d/nmgraph.ncfg
-	
-	mv README .README
-	rm -rf $(PKG_TMP)/var/run
-
-clean::
-	[ ! -f .README ] || mv .README README
-	rm -f debian/postinst
-	rm -f cfg/ngraph.ncfg

Copied: nagiosgrapher/tags/1.7.1-2.1/debian/rules (from rev 1978, nagiosgrapher/trunk/debian/rules)
===================================================================
--- nagiosgrapher/tags/1.7.1-2.1/debian/rules	                        (rev 0)
+++ nagiosgrapher/tags/1.7.1-2.1/debian/rules	2011-12-03 12:03:49 UTC (rev 1979)
@@ -0,0 +1,77 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+#CFGS=ngraph.{,d/{nmgraph,extra/check_weather,standard/check_{procs,ping,pop,http,load,users}}.}ncfg
+CFGS := ngraph.ncfg ngraph.d/nmgraph.ncfg
+TMPL_DIR := extra/ standard/
+
+PKG:=nagiosgrapher
+PKG_TMP:=debian/$(PKG)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/autotools.mk
+
+#DEB_MAKE_ENVVARS := BUILD_ROOT=$(CURDIR)/debian/tmp LC_ALL=C
+#DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+DEB_CONFIGURE_EXTRA_FLAGS := --with-layout=debian-patch --with-ng-srvext-dir=/etc/nagiosgrapher/nagios3/serviceext --with-ng-srvext-file=/etc/nagiosgrapher/nagios3/serviceext.cfg
+DEB_AUTO_UPDATE_AUTOCONF := 1 
+
+install/$(PKG)::
+	rm -f $(PKG_TMP)/usr/lib/$(PKG)/*.c
+	
+	for dir in $(TMPL_DIR); do \
+		mkdir -p $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/$$dir; \
+	done
+	
+	# install config templates
+	for cfg in $(CFGS); do \
+		mv $(PKG_TMP)/etc/$(PKG)/$$cfg* \
+		 $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/$$cfg; \
+	done
+	mkdir -p $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/nagios3
+	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 \
+			dest=`echo $$tmpl | sed "s#.*\($$tmpl_dir/.*\.ncfg\).*#\1#"`; \
+			mv $${tmpl} $(PKG_TMP)/usr/share/$(PKG)/debian/cfg/ngraph.d/$$dest; \
+			tmpl_cfgs="$$tmpl_cfgs $$dest"; \
+		done; \
+		mv $$tmpl_root/$$tmpl_dir $(PKG_TMP)/etc/$(PKG)/ngraph.d/; \
+	done; \
+	sed "s#@@CFGS@@#$(CFGS) nagios3/commands.cfg#g;s#@@TMPL_CFGS@@#$$tmpl_cfgs#g" < debian/postinst.in > debian/postinst
+	
+	# fix permissions
+	find $(PKG_TMP)/usr/share/nagiosgrapher/htdocs/images/ -type f -name "*.png" -print0 \
+		| xargs -0 chmod 0644 
+	chmod 0644 $(PKG_TMP)/usr/share/nagiosgrapher/debian/cfg/ngraph.d/nmgraph.ncfg
+	
+	mv README .README
+	rm -rf $(PKG_TMP)/var/run
+
+clean::
+	[ ! -f .README ] || mv .README README
+	rm -f debian/postinst
+	rm -f cfg/ngraph.ncfg




More information about the Pkg-nagios-changes mailing list