[Pkg-nagios-changes] [pkg-nagios] r1873 - nagios-plugins/trunk/debian

Jan Wagner waja at alioth.debian.org
Mon Mar 29 01:22:52 UTC 2010


Author: waja
Date: 2010-03-29 01:22:49 +0000 (Mon, 29 Mar 2010)
New Revision: 1873

Added:
   nagios-plugins/trunk/debian/nagios-plugins-basic.examples
   nagios-plugins/trunk/debian/nagios-plugins-standard.links
   nagios-plugins/trunk/debian/nagios-plugins.links
Removed:
   nagios-plugins/trunk/debian/TODO
   nagios-plugins/trunk/debian/docs
   nagios-plugins/trunk/debian/nagios-plugins.docs
Modified:
   nagios-plugins/trunk/debian/NEWS.Debian
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/nagios-plugins-basic.docs
   nagios-plugins/trunk/debian/nagios-plugins-standard.docs
   nagios-plugins/trunk/debian/rules
Log:
restruture documentation

Modified: nagios-plugins/trunk/debian/NEWS.Debian
===================================================================
--- nagios-plugins/trunk/debian/NEWS.Debian	2010-03-24 20:42:32 UTC (rev 1872)
+++ nagios-plugins/trunk/debian/NEWS.Debian	2010-03-29 01:22:49 UTC (rev 1873)
@@ -9,7 +9,7 @@
 nagios-plugins (1.4.14-1) unstable; urgency=low
 
   If your are using check_linux_raid.pl or check_bgpstate (respectively the
-  check_snmp_bgpstate), they will be removed sometimes in the future, as
+  check_snmp_bgpstate), they will be removed sometime in the future, as
   upstream will remove they shortly ... so be prepared!
 
   The qstat package is not a dependency any more but recommanded. As Recommands

Deleted: nagios-plugins/trunk/debian/TODO
===================================================================
--- nagios-plugins/trunk/debian/TODO	2010-03-24 20:42:32 UTC (rev 1872)
+++ nagios-plugins/trunk/debian/TODO	2010-03-29 01:22:49 UTC (rev 1873)
@@ -1,28 +0,0 @@
-
-After sarge: 
-
-- Remove the possibility to build with fileutils.
-
-- Now /usr/share/nagios/pluginconfig -> /etc/nagios-plugins/config
-  Remove the symlink af and conflict with nagios < (ver that reads from /etc)
-
-
-These are the plugins which miss .cfg files: add them if someone asks:
-
-/usr/lib/nagios/plugins/check_ups
-/usr/lib/nagios/plugins/check_mysql
-/usr/lib/nagios/plugins/check_swap
-/usr/lib/nagios/plugins/check_dig
-/usr/lib/nagios/plugins/check_breeze
-/usr/lib/nagios/plugins/check_disk_smb
-/usr/lib/nagios/plugins/check_ircd
-/usr/lib/nagios/plugins/check_log
-/usr/lib/nagios/plugins/check_oracle
-/usr/lib/nagios/plugins/check_sensors
-/usr/lib/nagios/plugins/check_wave
-/usr/lib/nagios/plugins/check_mailq
-/usr/lib/nagios/plugins/check_simap
-/usr/lib/nagios/plugins/check_spop
-
-
-

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2010-03-24 20:42:32 UTC (rev 1872)
+++ nagios-plugins/trunk/debian/changelog	2010-03-29 01:22:49 UTC (rev 1873)
@@ -1,6 +1,11 @@
 nagios-plugins (1.4.14-4) UNRELEASED; urgency=low
 
   * Remove libmysqlclient12-dev from Build-Deps, as it's obsolete
+  * Restructure shipped documentation
+    - Move all common stuff info nagios-plugins-basic
+    - Provide package specific documentation with the packages
+    - Provide symlinks from other packages
+  * Remove debian/TODO cause it't totally outdated
 
  -- Jan Wagner <waja at cyconet.org>  Wed, 24 Mar 2010 20:24:51 +0100
 

Deleted: nagios-plugins/trunk/debian/docs
===================================================================
--- nagios-plugins/trunk/debian/docs	2010-03-24 20:42:32 UTC (rev 1872)
+++ nagios-plugins/trunk/debian/docs	2010-03-29 01:22:49 UTC (rev 1873)
@@ -1,7 +0,0 @@
-FAQ
-NEWS
-README
-LEGAL
-REQUIREMENTS
-SUPPORT
-debian/README.Debian.plugins

Modified: nagios-plugins/trunk/debian/nagios-plugins-basic.docs
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-basic.docs	2010-03-24 20:42:32 UTC (rev 1872)
+++ nagios-plugins/trunk/debian/nagios-plugins-basic.docs	2010-03-29 01:22:49 UTC (rev 1873)
@@ -1,2 +1,8 @@
+FAQ
+NEWS
+README
+LEGAL
+REQUIREMENTS
+SUPPORT
 debian/NEWS.Debian
 debian/README.Debian

Added: nagios-plugins/trunk/debian/nagios-plugins-basic.examples
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-basic.examples	                        (rev 0)
+++ nagios-plugins/trunk/debian/nagios-plugins-basic.examples	2010-03-29 01:22:49 UTC (rev 1873)
@@ -0,0 +1 @@
+command.cfg

Modified: nagios-plugins/trunk/debian/nagios-plugins-standard.docs
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-standard.docs	2010-03-24 20:42:32 UTC (rev 1872)
+++ nagios-plugins/trunk/debian/nagios-plugins-standard.docs	2010-03-29 01:22:49 UTC (rev 1873)
@@ -1,3 +1 @@
-debian/NEWS.Debian
-debian/README.Debian
 debian/README.Debian.plugins

Copied: nagios-plugins/trunk/debian/nagios-plugins-standard.links (from rev 1868, nagios-plugins/trunk/debian/nagios-plugins.docs)
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins-standard.links	                        (rev 0)
+++ nagios-plugins/trunk/debian/nagios-plugins-standard.links	2010-03-29 01:22:49 UTC (rev 1873)
@@ -0,0 +1,10 @@
+usr/share/doc/nagios-plugins-basic/NEWS.Debian.gz usr/share/doc/nagios-plugins-standard/NEWS.Debian.gz
+usr/share/doc/nagios-plugins-basic/README.Debian.gz usr/share/doc/nagios-plugins-standard/README.Debian.gz
+usr/share/doc/nagios-plugins-basic/changelog.gz usr/share/doc/nagios-plugins-standard/changelog.gz
+usr/share/doc/nagios-plugins-basic/examples usr/share/doc/nagios-plugins-standard/examples
+usr/share/doc/nagios-plugins-basic/FAQ usr/share/doc/nagios-plugins-standard/FAQ
+usr/share/doc/nagios-plugins-basic/NEWS.gz usr/share/doc/nagios-plugins-standard/NEWS.gz
+usr/share/doc/nagios-plugins-basic/README usr/share/doc/nagios-plugins-standard/README
+usr/share/doc/nagios-plugins-basic/LEGAL usr/share/doc/nagios-plugins-standard/LEGAL
+usr/share/doc/nagios-plugins-basic/REQUIREMENTS usr/share/doc/nagios-plugins-standard/REQUIREMENTS
+usr/share/doc/nagios-plugins-basic/SUPPORT usr/share/doc/nagios-plugins-standard/SUPPORT

Deleted: nagios-plugins/trunk/debian/nagios-plugins.docs
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins.docs	2010-03-24 20:42:32 UTC (rev 1872)
+++ nagios-plugins/trunk/debian/nagios-plugins.docs	2010-03-29 01:22:49 UTC (rev 1873)
@@ -1,3 +0,0 @@
-debian/NEWS.Debian
-debian/README.Debian
-debian/README.Debian.plugins

Copied: nagios-plugins/trunk/debian/nagios-plugins.links (from rev 1868, nagios-plugins/trunk/debian/nagios-plugins.docs)
===================================================================
--- nagios-plugins/trunk/debian/nagios-plugins.links	                        (rev 0)
+++ nagios-plugins/trunk/debian/nagios-plugins.links	2010-03-29 01:22:49 UTC (rev 1873)
@@ -0,0 +1,11 @@
+usr/share/doc/nagios-plugins-basic/NEWS.Debian.gz usr/share/doc/nagios-plugins/NEWS.Debian.gz
+usr/share/doc/nagios-plugins-basic/README.Debian.gz usr/share/doc/nagios-plugins/README.Debian.gz
+usr/share/doc/nagios-plugins-standards/README.Debian.plugins usr/share/doc/nagios-plugins/README.Debian.plugins
+usr/share/doc/nagios-plugins-basic/changelog.gz usr/share/doc/nagios-plugins/changelog.gz
+usr/share/doc/nagios-plugins-basic/examples usr/share/doc/nagios-plugins/examples
+usr/share/doc/nagios-plugins-basic/FAQ usr/share/doc/nagios-plugins/FAQ
+usr/share/doc/nagios-plugins-basic/NEWS.gz usr/share/doc/nagios-plugins/NEWS.gz
+usr/share/doc/nagios-plugins-basic/README usr/share/doc/nagios-plugins/README
+usr/share/doc/nagios-plugins-basic/LEGAL usr/share/doc/nagios-plugins/LEGAL
+usr/share/doc/nagios-plugins-basic/REQUIREMENTS usr/share/doc/nagios-plugins/REQUIREMENTS
+usr/share/doc/nagios-plugins-basic/SUPPORT usr/share/doc/nagios-plugins/SUPPORT

Modified: nagios-plugins/trunk/debian/rules
===================================================================
--- nagios-plugins/trunk/debian/rules	2010-03-24 20:42:32 UTC (rev 1872)
+++ nagios-plugins/trunk/debian/rules	2010-03-29 01:22:49 UTC (rev 1873)
@@ -174,9 +174,10 @@
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-	dh_installchangelogs -i ChangeLog
+	dh_installchangelogs -i
 	dh_installdocs -i
-	dh_installexamples -i command.cfg
+	dh_link -i
+	dh_installexamples -i
 	dh_installman -i
 	dh_compress -i
 	dh_fixperms -i
@@ -189,9 +190,11 @@
 binary-arch: build install
 	dh_testdir -s
 	dh_testroot -s
-	dh_installchangelogs -s ChangeLog
+	dh_installchangelogs -p nagios-plugins-basic -s ChangeLog
+	dh_installchangelogs -Nnagios-plugins-basic
 	dh_installdocs -s
-	dh_installexamples -s command.cfg
+	dh_link -s
+	dh_installexamples -s
 	dh_installman -s
 	dh_strip -s
 	dh_compress -s
@@ -203,4 +206,4 @@
 	dh_builddeb -s
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install




More information about the Pkg-nagios-changes mailing list