[Pkg-nagios-changes] [pkg-nagios] r887 - nagios2/trunk/debian

[Marc Haber]

Author: zugschlus
Date: 2006-05-02 13:34:10 +0000 (Tue, 02 May 2006)
New Revision: 887

Added:
   nagios2/trunk/debian/nagios2-common.links
Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/rules
Log:
  * Fix /usr/share/doc/nagios2/html symlink.
    Thanks to Matt Zagrabelny. (mh) Closes: #360998



Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-04-30 16:45:24 UTC (rev 886)
+++ nagios2/trunk/debian/changelog	2006-05-02 13:34:10 UTC (rev 887)
@@ -3,8 +3,10 @@
   * NOT RELEASED YET
   * Fix nagios2 restart in init script.
     Thanks to Jim Jensen. (mh) Closes: #360778
+  * Fix /usr/share/doc/nagios2/html symlink.
+    Thanks to Matt Zagrabelny. (mh) Closes: #360998
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Sun, 30 Apr 2006 18:44:37 +0200
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Tue,  2 May 2006 13:13:11 +0000
 
 nagios2 (2.2-1) unstable; urgency=low
 

Added: nagios2/trunk/debian/nagios2-common.links
===================================================================
--- nagios2/trunk/debian/nagios2-common.links	2006-04-30 16:45:24 UTC (rev 886)
+++ nagios2/trunk/debian/nagios2-common.links	2006-05-02 13:34:10 UTC (rev 887)
@@ -0,0 +1 @@
+usr/share/nagios2/htdocs/docs usr/share/doc/nagios2-common/html

Modified: nagios2/trunk/debian/rules
===================================================================
--- nagios2/trunk/debian/rules	2006-04-30 16:45:24 UTC (rev 886)
+++ nagios2/trunk/debian/rules	2006-05-02 13:34:10 UTC (rev 887)
@@ -150,7 +150,6 @@
 	dh_installchangelogs -i
 	dh_install           -i
 	dh_installinit 	     --name nagios2 -- defaults 30 18
-	dh_link              -i usr/share/nagios2-common/htdocs/docs usr/share/doc/nagios2-common/html
 	dh_installexamples   -i
 	# and now set up the "nagios1 version" of the apache2.conf
 	sed -e 's,^#\(ScriptAlias /cgi-bin/nagios /usr/lib/cgi-bin/nagios2\),\1,' \
@@ -158,7 +157,6 @@
 		-e 's,^#\(Alias /nagios /usr/share/nagios2/htdocs\),\1,' \
 		-e 's,^ #\(AuthUserFile /etc/nagios/htpasswd.users\),   \1,' \
 		${bnc}/usr/share/doc/nagios2-common/examples/apache2.conf > ${bnc}/usr/share/doc/nagios2-common/examples/apache2.nagios1.conf
-	dh_link -a
 	touch install-stamp
 
 binary: binary-arch binary-indep
@@ -166,6 +164,7 @@
 	@echo "Doing $@"
 	dh_testdir           -a
 	dh_testroot          -a
+	dh_link		     -a
 	dh_install           -a
 	dh_strip             -a
 	dh_compress          -a
@@ -180,6 +179,7 @@
 binary-indep: install-stamp
 	# XXX some stuff below here is commented out
 	#install -m 755 cgi/grouplist.cgi.in debian/$@/usr/lib/cgi-bin/nagios/grouplist.cgi
+	dh_link		     -i
 	dh_compress          -i
 	dh_fixperms          -i -Xnagios2/resource.cfg
 	dh_installdebconf    -i