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

Wolfgang Barth wob-guest at alioth.debian.org
Sun Nov 29 13:13:19 UTC 2009


Author: wob-guest
Date: 2009-11-29 13:13:18 +0000 (Sun, 29 Nov 2009)
New Revision: 1797

Added:
   nagvis/trunk/debian/lintian-overrides
Removed:
   nagvis/trunk/debian/overrides
Modified:
   nagvis/trunk/debian/README.Debian
   nagvis/trunk/debian/changelog
   nagvis/trunk/debian/dirs
   nagvis/trunk/debian/examples
   nagvis/trunk/debian/install
   nagvis/trunk/debian/rules
Log:
rules cleanup
  todo: mv templates to /etc/nagvis


Modified: nagvis/trunk/debian/README.Debian
===================================================================
--- nagvis/trunk/debian/README.Debian	2009-11-28 16:36:46 UTC (rev 1796)
+++ nagvis/trunk/debian/README.Debian	2009-11-29 13:13:18 UTC (rev 1797)
@@ -1,6 +1,17 @@
 nagvis for Debian
 -----------------
 
+Starting with 1.4.5, there are changes from older packages.
+
+* URL and CGI-Path:
+Since nagvis now can be used with other systems like icinga or web interface 
+like ninja, the htdocs path is no longer part of nagios3 directory structure. 
+The new directory for nagvis is now /usr/share/nagvis/htdocs/nagvis. The 
+authentification therefore has to be configured separately. Have a look at 
+/etc/nagvis/apache.conf and edit it for your needs.
+
+ -- Wolfgang Barth <wob at swobspace.net>  Sat, 28 Nov 2009 12:00:00 +0200
+
 Thank you using the NagVis addon for Nagios Network Monitoring System.
 
 To get it work you have to be sure the ndoutils package is installed and works
@@ -19,33 +30,3 @@
 
  -- Hendrik Frenzel <hfrenzel at scunc.net>  Sat, 14 Jul 2007 11:27:33 +0200
 
-Starting with 1.4.5, there are changes from older packages.
-
-* URL and CGI-Path:
-Since nagvis now can be used with other systems like icinga or web interface 
-like ninja, the htdocs path is no longer part of nagios3 directory structure. 
-The new directory for nagvis is now /usr/share/nagvis/htdocs/nagvis. The 
-authentification therefore has to be configured separately. Have a look at 
-/etc/nagvis/apache.conf and edit it for your needs.
-
-* Templates:
-The template directory /etc/nagvis/templates has moved back to 
-/usr/share/nagvis/htdocs/nagvis/templates, images for templates now located in
-/usr/share/nagvis/htdocs/nagvis/images/templates
-
-If you installed your own templates in /etc/nagvis/templates, proceed the 
-following steps:
-
-- cp /etc/nagios/templates/header/*.png \
-  /usr/share/nagvis/htdocs/nagvis/images/templates/header/
-
-- cp /etc/nagios/templates/hover/*.png \
-  /usr/share/nagvis/htdocs/nagvis/images/templates/hover/
-
-- /etc/nagios/templates/header/*.{css,html}
-  /usr/share/nagvis/htdocs/nagvis/templates/header/
-
-- /etc/nagios/templates/hover/*.{css,html}
-  /usr/share/nagvis/htdocs/nagvis/templates/hover/
-
- -- Wolfgang Barth <wob at swobspace.net>  Sat, 28 Nov 2009 12:00:00 +0200

Modified: nagvis/trunk/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog	2009-11-28 16:36:46 UTC (rev 1796)
+++ nagvis/trunk/debian/changelog	2009-11-29 13:13:18 UTC (rev 1797)
@@ -12,11 +12,10 @@
     linked to /etc/apache2/conf.d
   * README.backends.Merlin added
 
- -- Wolfgang Barth <wob at swobspace.net>  Sat, 28 Nov 2009 09:23:36 +0100
+  [ Alexander Wirt ]
+  * New upstream version 
+  * Add myself to uploaders
 
-nagvis (1:1.4.4-1) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
   [ Hendrik Frenzel ]
   * fixed include path names in nagvis/ajax_handler.php
 
@@ -24,12 +23,8 @@
   * Updating standards version to 3.8.3
     - Add README.source
 
-  [ Alexander Wirt ]
-  * New upstream version 
-  * Add myself to uploaders
+ -- Wolfgang Barth <wob at swobspace.net>  Sat, 28 Nov 2009 09:23:36 +0100
 
- -- Alexander Wirt <formorer at debian.org>  Tue, 24 Nov 2009 08:45:37 +0100
-
 nagvis (1:1.3.1-3) unstable; urgency=low
 
   * adjust pathnames.dpatch to form_handler.php from correct location, thanks

Modified: nagvis/trunk/debian/dirs
===================================================================
--- nagvis/trunk/debian/dirs	2009-11-28 16:36:46 UTC (rev 1796)
+++ nagvis/trunk/debian/dirs	2009-11-29 13:13:18 UTC (rev 1797)
@@ -1,4 +1,5 @@
 etc/nagvis/maps
 etc/nagvis/templates
+var/lib/nagvis/images
 var/lib/nagvis/images/maps
 var/cache/nagvis

Modified: nagvis/trunk/debian/examples
===================================================================
--- nagvis/trunk/debian/examples	2009-11-28 16:36:46 UTC (rev 1796)
+++ nagvis/trunk/debian/examples	2009-11-29 13:13:18 UTC (rev 1797)
@@ -1,2 +1,2 @@
-debian/tmp/demo
+debian/nagvis/demo
 etc/nagvis.ini.php-sample

Modified: nagvis/trunk/debian/install
===================================================================
--- nagvis/trunk/debian/install	2009-11-28 16:36:46 UTC (rev 1796)
+++ nagvis/trunk/debian/install	2009-11-29 13:13:18 UTC (rev 1797)
@@ -1,4 +1,6 @@
-debian/tmp/etc/nagvis
-debian/tmp/etc/nagvis/maps
-debian/tmp/usr/share/nagvis
-debian/tmp/usr/share/lintian/overrides
+etc/* /etc/nagvis
+nagvis/* /usr/share/nagvis/htdocs/nagvis
+wui/* /usr/share/nagvis/htdocs/wui
+index.php  /usr/share/nagvis/htdocs
+debian/apache.conf /usr/share/nagvis/debian
+debian/apache.conf /etc/nagvis

Copied: nagvis/trunk/debian/lintian-overrides (from rev 1795, nagvis/trunk/debian/overrides)
===================================================================
--- nagvis/trunk/debian/lintian-overrides	                        (rev 0)
+++ nagvis/trunk/debian/lintian-overrides	2009-11-29 13:13:18 UTC (rev 1797)
@@ -0,0 +1,2 @@
+nagvis: package-contains-empty-directory usr/share/nagvis/htdocs/nagvis/images/shapes/
+

Deleted: nagvis/trunk/debian/overrides
===================================================================
--- nagvis/trunk/debian/overrides	2009-11-28 16:36:46 UTC (rev 1796)
+++ nagvis/trunk/debian/overrides	2009-11-29 13:13:18 UTC (rev 1797)
@@ -1,2 +0,0 @@
-nagvis: package-contains-empty-directory usr/share/nagvis/htdocs/nagvis/images/shapes/
-

Modified: nagvis/trunk/debian/rules
===================================================================
--- nagvis/trunk/debian/rules	2009-11-28 16:36:46 UTC (rev 1796)
+++ nagvis/trunk/debian/rules	2009-11-29 13:13:18 UTC (rev 1797)
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/dpatch/dpatch.make
-DEST = debian/tmp
+DEST = debian/nagvis
 
 configure: configure-stamp
 configure-stamp:
@@ -31,18 +31,11 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
+	dh_installdirs
+	dh_install
 	
-	install -d $(DEST)/etc/nagvis \
-			$(DEST)/usr/share/nagvis/debian/ \
-			$(DEST)/usr/share/nagvis/htdocs/nagvis/ \
-			$(DEST)/usr/share/nagvis/htdocs/wui/
-
-	install -d $(DEST)/var/lib/nagvis/images/maps
-	install -d $(DEST)/var/cache/nagvis
-	
 	[ -x /usr/bin/html2text ] && \
 		 /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/Changelog
-	cp -a etc/* $(DEST)/etc/nagvis
 	mv $(DEST)/etc/nagvis/nagvis.ini.php-sample \
 		$(DEST)/usr/share/nagvis/debian/
 	sed -e 's/^[; ]*\(\<dbhost\) *=.*$$/\1=_DBC_DBSERVER_/' \
@@ -55,38 +48,15 @@
 	 mv $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample.new \
 	    $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample
 	
-	cp -a nagvis/* $(DEST)/usr/share/nagvis/htdocs/nagvis/.
-	#--# install -d $(DEST)/usr/share/nagvis/htdocs/nagvis/includes/.
-	#--# cp -a nagvis/includes/* $(DEST)/usr/share/nagvis/htdocs/nagvis/includes/.
-	#--# cp -a nagvis/*.php $(DEST)/usr/share/nagvis/htdocs/nagvis/.
-	
-	cp -a wui/* $(DEST)/usr/share/nagvis/htdocs/wui/.
-
-	cp -a index.php $(DEST)/usr/share/nagvis/htdocs/.
-	
-	#--# install -d $(DEST)/etc/nagvis/templates/
-	#--# cp -a nagvis/templates/* $(DEST)/etc/nagvis/templates/
-	
 	# demo site
 	install -d $(DEST)/demo/nagvis/images/maps $(DEST)/demo/etc/nagvis/maps
 	mv $(DEST)/etc/nagvis/maps/demo*.cfg $(DEST)/demo/etc/nagvis/maps/
 	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/images/maps/nagvis-demo.png \
 		$(DEST)/demo/nagvis/images/maps/
-	#--# rm -rf $(DEST)/usr/share/nagvis/htdocs/nagvis/images/templates
 	rm -rf $(DEST)/usr/share/nagvis/htdocs/nagvis/images/maps
 	
-	# config templates
-	install -m 755 -d $(DEST)/usr/share/nagvis/debian
-	install -m 644 debian/apache.conf $(DEST)/usr/share/nagvis/debian/
-	install -m 644 debian/apache.conf $(DEST)/etc/nagvis/
-	
-	# lintian overrides
-	install -m 755 -d $(DEST)/usr/share/lintian/overrides
-	install -m 644 debian/overrides $(DEST)/usr/share/lintian/overrides/nagvis
-	
-	dh_installdirs
-	dh_install
 	dh_link
+	dh_lintian
 
 # Build architecture-dependent files here.
 binary-arch: build install




More information about the Pkg-nagios-changes mailing list