fixed symlinks and removed unnecessary directories

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

diff --git a/debian/changelog b/debian/changelog
index e89bdf356d2114dba5b1350b7b1c895ceb1a0288..f7ee722cb20dfa1d739de7d0efc597fec28e175c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nagvis (1:1.1-3) unstable; urgency=low
+
+  * Fixed symlinks
+  * Removed unnecessary directories
+
+ -- Hendrik Frenzel <hfrenzel@scunc.net>  Fri, 19 Oct 2007 10:07:13 +0200
+
 nagvis (1:1.1-2) unstable; urgency=low
 
   * Symlinked images/maps and images/tempates to the apropriate directory below

diff --git a/debian/dirs b/debian/dirs
index 32548f916d08acd3dbdd2b33963ad5a6ed4dafae..d7a8152b4f5c3b203f44f3fc22d0272536036f09 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1 @@
 etc/nagvis/maps
-usr/share/nagvis/htdocs/nagvis/images/maps

diff --git a/debian/install b/debian/install
index 96ca6a97b8c26ce0a07887f8d549dbefbb87abb1..bcc8ac4e0d088d62d5386776305488f020f69d5b 100644 (file)
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,3 @@
 debian/tmp/etc/nagvis
 debian/tmp/etc/nagvis/maps
 debian/tmp/usr/share/nagvis
-debian/tmp/usr/share/nagvis/htdocs/nagvis/images/maps

diff --git a/debian/links b/debian/links
index b7e513be74755c0a50506d97b84da72884890f96..3c913c4fb213a2a01669f9c837f0cfc10a587659 100644 (file)
--- a/debian/links
+++ b/debian/links
@@ -1,5 +1,5 @@
 etc/nagvis/maps usr/share/nagvis/htdocs/nagvis/etc/maps
-etc/nagvis/maps usr/share/nagvis/htdocs/nagvis/htdocs/nagvis/images/maps
+etc/nagvis/maps usr/share/nagvis/htdocs/nagvis/images/maps
 etc/nagvis/templates usr/share/nagvis/htdocs/nagvis/etc/templates
-etc/nagvis/templates usr/share/nagvis/htdocs/nagvis/htdocs/nagvis/images/templates
+etc/nagvis/templates usr/share/nagvis/htdocs/nagvis/images/templates
 usr/share/nagvis/htdocs usr/share/nagios2/htdocs/nagvis

diff --git a/debian/rules b/debian/rules
index 4ed878188c7577251fce8eccfd2c6ac058c7e7a5..362cf520a278091ed735aa47c098d03e9a80d90e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,8 @@ install: build
        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
        mkdir -p $(DEST)/usr/share/nagvis/debian