From: tolimar <tolimar@98d490a6-b407-0410-aaaa-fdee166ba3f5>
Date: Mon, 26 Sep 2011 13:59:19 +0000 (+0000)
Subject: Rework rules and install slightly
X-Git-Url: https://git.tokkee.org/?p=pkg-nagvis.git;a=commitdiff_plain;h=d0dc58a5ed07898452c1bd0e40f9841f21a22b70

Rework rules and install slightly



git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1972 98d490a6-b407-0410-aaaa-fdee166ba3f5
---

diff --git a/debian/changelog b/debian/changelog
index c4910f8..d783547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ nagvis (1:1.5.10-1) UNRELEASED; urgency=low
   * 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@debian.org>  Mon, 26 Sep 2011 15:51:49 +0200
 
diff --git a/debian/install b/debian/install
index 3a7c546..9d30939 100644
--- a/debian/install
+++ b/debian/install
@@ -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
diff --git a/debian/rules b/debian/rules
index 48ecf48..d0755b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,20 +36,12 @@ clean: unpatch
 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/.
-	
-	# -- templates
-	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/templates $(DEST)/etc/nagvis/.
-	
-	# -- gadgets
-	mv $(DEST)/usr/share/nagvis/htdocs/nagvis/gadgets $(DEST)/etc/nagvis/.
+	# -- move user files
+	mv $(DEST)/usr/share/nagvis/htdocs/share/userfiles/ $(DEST)/etc/nagvis/.
 	
 	[ -x /usr/bin/html2text ] && \
 		 /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/changelog