[Pkg-nagios-changes] [pkg-icinga2] 01/12: Moved HTML docs to separate package and path

[Markus Frosch]

This is an automated email from the git hooks/post-receive script.

lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga2.

commit 0a86989022376d655e8c6553955d65df9a7e1fb5
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Oct 15 11:32:02 2013 +0200

    Moved HTML docs to separate package and path
---
 debian/control                            |   12 ++++++++++
 debian/icinga2-common.install             |    1 -
 debian/icinga2-doc.doc-base               |   10 ++++++++
 debian/icinga2-doc.install                |    1 +
 debian/patches/10_move_htmldocs_to_subdir |   37 +++++++++++++++++++++++++++++
 debian/patches/series                     |    1 +
 6 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index c63ecef..e1cfe44 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Architecture: any
 Depends: icinga2-core (= ${binary:Version}),
          icinga2-common (= ${source:Version}),
          ${misc:Depends}
+Recommends: icinga2-doc
 Description: host and network monitoring system
  Icinga 2 is still in development and not ready for production use!
  .
@@ -57,3 +58,14 @@ Description: host and network monitoring system - daemon
  .
  This package provides the Icinga 2 daemon.
 
+Package: icinga2-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: host and network monitoring system - documentation
+ Icinga 2 is still in development and not ready for production use!
+ .
+ Better description to come.
+ .
+ This package provides the Icinga 2 documentation.
+
diff --git a/debian/icinga2-common.install b/debian/icinga2-common.install
index c83d76a..5dbdb5f 100644
--- a/debian/icinga2-common.install
+++ b/debian/icinga2-common.install
@@ -1,4 +1,3 @@
 debian/tmp/etc/icinga2
 usr/sbin/i2*feature
-usr/share/doc/icinga2
 usr/share/icinga2
diff --git a/debian/icinga2-doc.doc-base b/debian/icinga2-doc.doc-base
new file mode 100644
index 0000000..170ab7e
--- /dev/null
+++ b/debian/icinga2-doc.doc-base
@@ -0,0 +1,10 @@
+Document: icinga2
+Title: Icinga 2 Documentation
+Author: Icinga Developement Team
+Abstract: Icinga 2 user and administrator's documentation
+Section: Network/Monitoring
+
+Format: HTML
+Index: /usr/share/doc/icinga2/htdocs/index.html
+Files: /usr/share/doc/icinga2/htdocs/*.html
+
diff --git a/debian/icinga2-doc.install b/debian/icinga2-doc.install
new file mode 100644
index 0000000..519ebc0
--- /dev/null
+++ b/debian/icinga2-doc.install
@@ -0,0 +1 @@
+usr/share/doc/icinga2/htdocs
diff --git a/debian/patches/10_move_htmldocs_to_subdir b/debian/patches/10_move_htmldocs_to_subdir
new file mode 100644
index 0000000..8697079
--- /dev/null
+++ b/debian/patches/10_move_htmldocs_to_subdir
@@ -0,0 +1,37 @@
+Description: install html documentation into subdirectory
+Author: Markus Frosch <markus at lazyfrosch.de>
+Origin: maintainer
+Bug: https://dev.icinga.org/issues/4876
+Last-Update: 2013-10-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -52,7 +52,7 @@
+ CLEANFILES = \
+ 	index.html
+ 
+-icinga2docdir = ${docdir}
++icinga2docdir = ${docdir}/htdocs
+ icinga2doc_DATA = \
+ 	index.html \
+ 	$(DOCVIEWER_FILES)
+--- a/doc/strapdownjs/Makefile.am
++++ b/doc/strapdownjs/Makefile.am
+@@ -1,7 +1,7 @@
+ SUBDIRS = \
+ 	themes
+ 
+-icinga2docdir = ${docdir}/strapdownjs
++icinga2docdir = ${docdir}/htdocs/strapdownjs
+ icinga2doc_DATA = \
+ 	strapdown.js \
+ 	strapdown.css
+--- a/doc/strapdownjs/themes/Makefile.am
++++ b/doc/strapdownjs/themes/Makefile.am
+@@ -1,4 +1,4 @@
+-icinga2docdir = ${docdir}/strapdownjs/themes
++icinga2docdir = ${docdir}/htdocs/strapdownjs/themes
+ icinga2doc_DATA = \
+ 	bootstrap.min.css \
+ 	bootstrap-responsive.min.css \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bd13e59
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10_move_htmldocs_to_subdir

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git