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

[Alexander Reichle-Schmehl]

Author: tolimar
Date: 2011-09-26 13:59:19 +0000 (Mon, 26 Sep 2011)
New Revision: 1972

Modified:
   nagvis/trunk/debian/changelog
   nagvis/trunk/debian/install
   nagvis/trunk/debian/rules
Log:
Rework rules and install slightly



Modified: nagvis/trunk/debian/changelog
===================================================================
--- nagvis/trunk/debian/changelog	2011-09-26 13:52:13 UTC (rev 1971)
+++ nagvis/trunk/debian/changelog	2011-09-26 13:59:19 UTC (rev 1972)
@@ -8,6 +8,7 @@
   * removed patches/php5.3-deprecated-ereg.dpatch; applied upstream
   * removed patches/fix-get_class-object.dpatch; no longer needed
   * removed patches/visibility_magic-set-method.dpatch; no longer needed
+  * rework debian/rules and install files
 
  -- Alexander Reichle-Schmehl <tolimar at debian.org>  Mon, 26 Sep 2011 15:51:49 +0200
 

Modified: nagvis/trunk/debian/install
===================================================================
--- nagvis/trunk/debian/install	2011-09-26 13:52:13 UTC (rev 1971)
+++ nagvis/trunk/debian/install	2011-09-26 13:59:19 UTC (rev 1972)
@@ -1,7 +1,5 @@
 etc/* /etc/nagvis
-nagvis/* /usr/share/nagvis/htdocs/nagvis
 docs /usr/share/doc/nagvis
-wui/* /usr/share/nagvis/htdocs/wui
-index.php  /usr/share/nagvis/htdocs
+share/ /usr/share/nagvis/htdocs
 debian/apache.conf /usr/share/nagvis/debian
 debian/apache.conf /etc/nagvis

Modified: nagvis/trunk/debian/rules
===================================================================
--- nagvis/trunk/debian/rules	2011-09-26 13:52:13 UTC (rev 1971)
+++ nagvis/trunk/debian/rules	2011-09-26 13:59:19 UTC (rev 1972)
@@ -36,21 +36,13 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	dh_install
 	
-	# -- images to /var 
-	rm -f $(DEST)/usr/share/nagvis/htdocs/nagvis/images/*/.gitignore
-	rm -f $(DEST)/usr/share/nagvis/htdocs/nagvis/images/*/*/.gitignore
-	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/images/* $(DEST)/var/lib/nagvis/images/.
+	# -- move user files
+	mv $(DEST)/usr/share/nagvis/htdocs/share/userfiles/ $(DEST)/etc/nagvis/.
 	
-	# -- templates
-	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/templates $(DEST)/etc/nagvis/.
-	
-	# -- gadgets
-	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/gadgets $(DEST)/etc/nagvis/.
-	
 	[ -x /usr/bin/html2text ] && \
 		 /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/changelog
 	mv $(DEST)/etc/nagvis/nagvis.ini.php-sample \