[Pkg-nagios-changes] [pkg-nagios-plugins] 229/413: restruture documentation
Jan Wagner
waja at moszumanska.debian.org
Tue Nov 26 23:13:26 UTC 2013
This is an automated email from the git hooks/post-receive script.
waja pushed a commit to branch master
in repository pkg-nagios-plugins.
commit e2801bf7ef6609ab59c2bc687c01f1be67e23caa
Author: Jan Wagner <waja at cyconet.org>
Date: Mon Mar 29 01:22:49 2010 +0000
restruture documentation
---
debian/NEWS.Debian | 2 +-
debian/TODO | 28 ----------------------------
debian/changelog | 5 +++++
debian/docs | 7 -------
debian/nagios-plugins-basic.docs | 6 ++++++
debian/nagios-plugins-basic.examples | 1 +
debian/nagios-plugins-standard.docs | 2 --
debian/nagios-plugins-standard.links | 10 ++++++++++
debian/nagios-plugins.docs | 3 ---
debian/nagios-plugins.links | 11 +++++++++++
debian/rules | 13 ++++++++-----
11 files changed, 42 insertions(+), 46 deletions(-)
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index e9665c1..bad2c7b 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -9,7 +9,7 @@ nagios-plugins (1.4.14-2) unstable; urgency=low
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
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 6716265..0000000
--- a/debian/TODO
+++ /dev/null
@@ -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
-
-
-
diff --git a/debian/changelog b/debian/changelog
index 0ba7a3d..6dd73bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index ca7a2b4..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,7 +0,0 @@
-FAQ
-NEWS
-README
-LEGAL
-REQUIREMENTS
-SUPPORT
-debian/README.Debian.plugins
diff --git a/debian/nagios-plugins-basic.docs b/debian/nagios-plugins-basic.docs
index 083d537..0ade346 100644
--- a/debian/nagios-plugins-basic.docs
+++ b/debian/nagios-plugins-basic.docs
@@ -1,2 +1,8 @@
+FAQ
+NEWS
+README
+LEGAL
+REQUIREMENTS
+SUPPORT
debian/NEWS.Debian
debian/README.Debian
diff --git a/debian/nagios-plugins-basic.examples b/debian/nagios-plugins-basic.examples
new file mode 100644
index 0000000..25fc790
--- /dev/null
+++ b/debian/nagios-plugins-basic.examples
@@ -0,0 +1 @@
+command.cfg
diff --git a/debian/nagios-plugins-standard.docs b/debian/nagios-plugins-standard.docs
index f54e644..27af518 100644
--- a/debian/nagios-plugins-standard.docs
+++ b/debian/nagios-plugins-standard.docs
@@ -1,3 +1 @@
-debian/NEWS.Debian
-debian/README.Debian
debian/README.Debian.plugins
diff --git a/debian/nagios-plugins-standard.links b/debian/nagios-plugins-standard.links
new file mode 100644
index 0000000..93ec47b
--- /dev/null
+++ b/debian/nagios-plugins-standard.links
@@ -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
diff --git a/debian/nagios-plugins.docs b/debian/nagios-plugins.docs
deleted file mode 100644
index f54e644..0000000
--- a/debian/nagios-plugins.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/NEWS.Debian
-debian/README.Debian
-debian/README.Debian.plugins
diff --git a/debian/nagios-plugins.links b/debian/nagios-plugins.links
new file mode 100644
index 0000000..a79d189
--- /dev/null
+++ b/debian/nagios-plugins.links
@@ -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
diff --git a/debian/rules b/debian/rules
index 0739f82..644a3ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -174,9 +174,10 @@ install: build
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-indep: build install
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 @@ binary-arch: build install
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins.git
More information about the Pkg-nagios-changes
mailing list