rules cleanup

  todo: mv templates to /etc/nagvis

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

diff --git a/debian/README.Debian b/debian/README.Debian
index 9aefffcbfc609b5da5405ebd7088ad04a476bd1c..a8b291ad73d4972fcd62bd756b07e92809ca3e4c 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,17 @@
 nagvis for Debian
 -----------------
 
 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@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
 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 @@ its owner and group to be www-data:www-data.
 
  -- Hendrik Frenzel <hfrenzel@scunc.net>  Sat, 14 Jul 2007 11:27:33 +0200
 
 
  -- Hendrik Frenzel <hfrenzel@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@swobspace.net>  Sat, 28 Nov 2009 12:00:00 +0200

diff --git a/debian/changelog b/debian/changelog
index c939dbc01fc2f9999b6578f9ff1a0c8e9440023a..10a332e93249471b8ec3cabcdddf4a8ba0051924 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,11 +12,10 @@ nagvis (1:1.4.5-1) UNRELEASED; urgency=low
     linked to /etc/apache2/conf.d
   * README.backends.Merlin added
 
     linked to /etc/apache2/conf.d
   * README.backends.Merlin added
 

- -- Wolfgang Barth <wob@swobspace.net>  Sat, 28 Nov 2009 09:23:36 +0100
-
-nagvis (1:1.4.4-1) UNRELEASED; urgency=low
+  [ Alexander Wirt ]
+  * New upstream version 
+  * Add myself to uploaders

 
 

-  * NOT RELEASED YET

   [ Hendrik Frenzel ]
   * fixed include path names in nagvis/ajax_handler.php
 
   [ Hendrik Frenzel ]
   * fixed include path names in nagvis/ajax_handler.php
 


@@ -24,11 +23,7 @@ nagvis (1:1.4.4-1) UNRELEASED; urgency=low
   * Updating standards version to 3.8.3
     - Add README.source
 
   * Updating standards version to 3.8.3
     - Add README.source
 

-  [ Alexander Wirt ]
-  * New upstream version 
-  * Add myself to uploaders
-
- -- Alexander Wirt <formorer@debian.org>  Tue, 24 Nov 2009 08:45:37 +0100
+ -- Wolfgang Barth <wob@swobspace.net>  Sat, 28 Nov 2009 09:23:36 +0100

 
 nagvis (1:1.3.1-3) unstable; urgency=low
 
 
 nagvis (1:1.3.1-3) unstable; urgency=low
 

diff --git a/debian/dirs b/debian/dirs
index 6ec1f2a345fe1c01ef5614f36b5468ee24fc886a..df1351bea3f9c88d14f5850bd8f0a5f673aea916 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,4 +1,5 @@
 etc/nagvis/maps
 etc/nagvis/templates
 etc/nagvis/maps
 etc/nagvis/templates

+var/lib/nagvis/images

 var/lib/nagvis/images/maps
 var/cache/nagvis
 var/lib/nagvis/images/maps
 var/cache/nagvis

diff --git a/debian/examples b/debian/examples
index 41159398a17f1279eb375d206f9a2b6283e2d2ce..bb3f37859d8303f7404d2925e7461d34229660d8 100644 (file)
--- a/debian/examples
+++ b/debian/examples
@@ -1,2 +1,2 @@
-debian/tmp/demo
+debian/nagvis/demo

 etc/nagvis.ini.php-sample
 etc/nagvis.ini.php-sample

diff --git a/debian/install b/debian/install
index 9e319df01dafd3978fdad05cb4eabff2760a15dd..6453fb2dfcb9f4e4ccb1d7d46366a4596d561b46 100644 (file)
--- a/debian/install
+++ b/debian/install
@@ -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

diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644 (file)
index 0000000..1b94a80
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,2 @@
+nagvis: package-contains-empty-directory usr/share/nagvis/htdocs/nagvis/images/shapes/
+

diff --git a/debian/overrides b/debian/overrides
deleted file mode 100644 (file)
index 1b94a80..0000000
--- a/debian/overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-nagvis: package-contains-empty-directory usr/share/nagvis/htdocs/nagvis/images/shapes/
-

diff --git a/debian/rules b/debian/rules
index 16b81240b7e26fecd51903e006fd9db8440d9633..5ac8ae81b3f9faa56d1186f3c7645bc9811335ea 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #export DH_VERBOSE=1
 
 include /usr/share/dpatch/dpatch.make
 #export DH_VERBOSE=1
 
 include /usr/share/dpatch/dpatch.make

-DEST = debian/tmp
+DEST = debian/nagvis

 
 configure: configure-stamp
 configure-stamp:
 
 configure: configure-stamp
 configure-stamp:


@@ -31,18 +31,11 @@ install: build
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_testdir
        dh_testroot
        dh_clean -k

-       
-       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
+       dh_installdirs
+       dh_install

        
        [ -x /usr/bin/html2text ] && \
                 /usr/bin/html2text -ascii -nobs < docs/en_US/changelog.html > docs/Changelog
        
        [ -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_/' \
        mv $(DEST)/etc/nagvis/nagvis.ini.php-sample \
                $(DEST)/usr/share/nagvis/debian/
        sed -e 's/^[; ]*\(\<dbhost\) *=.*$$/\1=_DBC_DBSERVER_/' \


@@ -55,38 +48,15 @@ install: build
         mv $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample.new \
            $(DEST)/usr/share/nagvis/debian/nagvis.ini.php-sample
        
         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/
        # 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
        
        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_link

+       dh_lintian

 
 # Build architecture-dependent files here.
 binary-arch: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install