[Pkg-nagios-changes] [pkg-nagios] r1201 - in nagiosgrapher/trunk/debian: . patches

Mon Jul 23 20:07:46 UTC 2007

Author: hfrenzel-guest
Date: 2007-07-23 20:07:46 +0000 (Mon, 23 Jul 2007)
New Revision: 1201

Added:
   nagiosgrapher/trunk/debian/manpages
   nagiosgrapher/trunk/debian/nagiosgrapher.8
Modified:
   nagiosgrapher/trunk/debian/changelog
   nagiosgrapher/trunk/debian/init
   nagiosgrapher/trunk/debian/patches/debian.dpatch
   nagiosgrapher/trunk/debian/postinst.in
   nagiosgrapher/trunk/debian/rules
Log:
fixing some lintian issues


Modified: nagiosgrapher/trunk/debian/changelog
===================================================================

--- nagiosgrapher/trunk/debian/changelog	2007-07-21 10:10:04 UTC (rev 1200)
+++ nagiosgrapher/trunk/debian/changelog	2007-07-23 20:07:46 UTC (rev 1201)
@@ -1,3 +1,9 @@
+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

Modified: nagiosgrapher/trunk/debian/init
===================================================================
--- nagiosgrapher/trunk/debian/init	2007-07-21 10:10:04 UTC (rev 1200)
+++ nagiosgrapher/trunk/debian/init	2007-07-23 20:07:46 UTC (rev 1201)
@@ -10,6 +10,18 @@
 # Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl
 #
 
+### BEGIN INIT INFO
+# Provides:          nagiosgrapher
+# Required-Start:    $all
+# Required-Stop:     $all
+# Should-Start:      $local_fs
+# Should-Stop:       $local_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: NagiosGrapher daemon 
+# Description:       Starts nagiosgrapher daemon at boottime
+### END INIT INFO
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/nagiosgrapher
 NAME=nagiosgrapher

Added: nagiosgrapher/trunk/debian/manpages
===================================================================
--- nagiosgrapher/trunk/debian/manpages	                        (rev 0)
+++ nagiosgrapher/trunk/debian/manpages	2007-07-23 20:07:46 UTC (rev 1201)
@@ -0,0 +1 @@
+debian/nagiosgrapher.8

Added: nagiosgrapher/trunk/debian/nagiosgrapher.8
===================================================================
--- nagiosgrapher/trunk/debian/nagiosgrapher.8	                        (rev 0)
+++ nagiosgrapher/trunk/debian/nagiosgrapher.8	2007-07-23 20:07:46 UTC (rev 1201)
@@ -0,0 +1,14 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH NAGIOSGRAPHER "8" "July 2007" "nagiosgrapher" "System Commands"
+.SH NAME
+nagiosgrapher \- Collects data from nagios and pipes them to generate graphs. 
+.SH SYNOPSIS
+.B nagiosgrapher
+[\fI-h | --help\fR] [\fI-v <level>\fR]
+.SH DESCRIPTION
+Collects event data from nagios montitoring system and pipes them into rrd
+to create graphs.
+.PP
+-h --help   Should show you a help screen.
+.PP
+-v <level>  Sets verbose level, e.g. -v 255

Modified: nagiosgrapher/trunk/debian/patches/debian.dpatch
===================================================================
--- nagiosgrapher/trunk/debian/patches/debian.dpatch	2007-07-21 10:10:04 UTC (rev 1200)
+++ nagiosgrapher/trunk/debian/patches/debian.dpatch	2007-07-23 20:07:46 UTC (rev 1201)
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad nagiosgrapher-1.6.1rc3~/Makefile.in nagiosgrapher-1.6.1rc3/Makefile.in
 --- nagiosgrapher-1.6.1rc3~/Makefile.in	2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1rc3/Makefile.in	2007-07-19 16:04:33.000000000 +0200
++++ nagiosgrapher-1.6.1rc3/Makefile.in	2007-07-23 21:43:11.000000000 +0200
 @@ -135,17 +135,17 @@
  
  dirs:
@@ -24,8 +24,9 @@
  	mkdir -p $(DESTDIR)/$(NG_RRD)
  
  logfile:
- 	touch $(DESTDIR)/$(NG_LOGFILE)
+-	touch $(DESTDIR)/$(NG_LOGFILE)
 -	chown $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_LOGFILE)
++	#touch $(DESTDIR)/$(NG_LOGFILE)
 +	#chown $(NAGIOS_PROC_USER) $(DESTDIR)/$(NG_LOGFILE)
  
  config-install:
@@ -85,7 +86,7 @@
  	mkdir -p $(DESTDIR)/$(NAGIOS_IMAGES)
 diff -urNad nagiosgrapher-1.6.1rc3~/cfg/ngraph.ncfg.in nagiosgrapher-1.6.1rc3/cfg/ngraph.ncfg.in
 --- nagiosgrapher-1.6.1rc3~/cfg/ngraph.ncfg.in	2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1rc3/cfg/ngraph.ncfg.in	2007-07-19 16:04:33.000000000 +0200
++++ nagiosgrapher-1.6.1rc3/cfg/ngraph.ncfg.in	2007-07-23 21:42:47.000000000 +0200
 @@ -11,7 +11,7 @@
          interface				@NG_INTERFACE@
  
@@ -123,7 +124,7 @@
          log_file                @NG_LOGFILE@
 diff -urNad nagiosgrapher-1.6.1rc3~/config.layout nagiosgrapher-1.6.1rc3/config.layout
 --- nagiosgrapher-1.6.1rc3~/config.layout	2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1rc3/config.layout	2007-07-19 16:04:33.000000000 +0200
++++ nagiosgrapher-1.6.1rc3/config.layout	2007-07-23 21:42:47.000000000 +0200
 @@ -22,22 +22,22 @@
  
  # layout for debian package install
@@ -164,7 +165,7 @@
  # PLD layout
 diff -urNad nagiosgrapher-1.6.1rc3~/configure.ac nagiosgrapher-1.6.1rc3/configure.ac
 --- nagiosgrapher-1.6.1rc3~/configure.ac	2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1rc3/configure.ac	2007-07-19 16:04:53.000000000 +0200
++++ nagiosgrapher-1.6.1rc3/configure.ac	2007-07-23 21:42:47.000000000 +0200
 @@ -18,7 +18,7 @@
  	AC_MSG_ERROR([cannot use $PACKAGE_NAME without perl])
  fi
@@ -206,7 +207,7 @@
  
 diff -urNad nagiosgrapher-1.6.1rc3~/lib/NagiosGrapher.pm.in nagiosgrapher-1.6.1rc3/lib/NagiosGrapher.pm.in
 --- nagiosgrapher-1.6.1rc3~/lib/NagiosGrapher.pm.in	2007-03-07 15:03:44.000000000 +0100
-+++ nagiosgrapher-1.6.1rc3/lib/NagiosGrapher.pm.in	2007-07-19 16:04:33.000000000 +0200
++++ nagiosgrapher-1.6.1rc3/lib/NagiosGrapher.pm.in	2007-07-23 21:42:47.000000000 +0200
 @@ -49,7 +49,7 @@
  our $ngraphcfg = '@NG_CONFIG@/ngraph.ncfg';
  our $xmlfile   = 'index.xml';

Modified: nagiosgrapher/trunk/debian/postinst.in
===================================================================
--- nagiosgrapher/trunk/debian/postinst.in	2007-07-21 10:10:04 UTC (rev 1200)
+++ nagiosgrapher/trunk/debian/postinst.in	2007-07-23 20:07:46 UTC (rev 1201)
@@ -29,25 +29,24 @@
 #          <conflicting-package> <version>
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
-CFGS=@@CFGS@@
+CFGS="@@CFGS@@"
 
 case "$1" in
     configure)
-    	for cfg in @@CFGS@@; do
+    	for cfg in $CFGS; do
 		ucf /usr/share/nagiosgrapher/debian/cfg/$cfg \
 			/etc/nagiosgrapher/$cfg
 	done
 
-	for dir in /var/lib/nagiosgrapher{,/rrd} \
+	for dir in /var/lib/nagiosgrapher /var/lib/nagiosgrapher/rrd \
 		/var/cache/nagiosgrapher \
 		/var/log/nagiosgrapher \
-		etc/nagios2/serviceext; do
+		/etc/nagios2/serviceext; do
 		test -d $dir && setperm nagios nagios 0755 $dir
 	done
 
 	for file in /var/log/nagiosgrapher/ngraph.log \
-		/var/cache/nagiosgrapher/NagiosGrapher.obj \
-		/etc/nagios2/serviceext; do
+		/var/cache/nagiosgrapher/NagiosGrapher.obj; do \
 		test -f $file && setperm nagios nagios 0644 $file
 	done
     ;;

Modified: nagiosgrapher/trunk/debian/rules
===================================================================
--- nagiosgrapher/trunk/debian/rules	2007-07-21 10:10:04 UTC (rev 1200)
+++ nagiosgrapher/trunk/debian/rules	2007-07-23 20:07:46 UTC (rev 1201)
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-CFGS=ngraph.{,d/{nmgraph,extra/check_weather,standard/check_{procs,ping,pop,http,load,users}}.}ncfg
+#CFGS=ngraph.{,d/{nmgraph,extra/check_weather,standard/check_{procs,ping,pop,http,load,users}}.}ncfg
+CFGS:=ngraph.ncfg ngraph.d/nmgraph.ncfg ngraph.d/extra/check_weather.ncfg ngraph.d/standard/check_procs.ncfg ngraph.d/standard/check_ping.ncfg ngraph.d/standard/check_pop.ncfg ngraph.d/standard/check_http.ncfg ngraph.d/standard/check_load.ncfg ngraph.d/standard/check_users.ncfg
+
 PKG=nagiosgrapher
 
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -15,10 +17,14 @@
 
 install/$(PKG)::
 	rm -f debian/$(PKG)/usr/lib/$(PKG)/*.c
-	mkdir -p debian/$(PKG)/usr/share/$(PKG)/debian/cfg/ngraph.d/{standard,extra}
+	for dir in standard extra; do \
+		mkdir -p debian/$(PKG)/usr/share/$(PKG)/debian/cfg/ngraph.d/$$dir; \
+	done
 	for cfg in $(CFGS); do \
 		mv debian/$(PKG)/etc/$(PKG)/$$cfg \
 			debian/$(PKG)/usr/share/$(PKG)/debian/cfg/$$cfg; \
 	done
 	sed "s#@@CFGS@@#$(CFGS)#g" < debian/postinst.in > debian/postinst
+	find debian/$(PKG)/usr/share/nagiosgrapher/htdocs/images/ -type f -name "*.png" -print0 \
+		| xargs -0 chmod 0644 
 


