[Debian-ha-commits] [crmsh] 05/09: Added crmsh-doc to package offering

[Richard Winters]

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

devrik-guest pushed a commit to branch master
in repository crmsh.

commit b0e15d8968b288c3a61b06ad0f02b792c0d58256
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu Apr 30 18:04:47 2015 -0400

    Added crmsh-doc to package offering
    
     - crmsh.install added as it's necessary now that there are
       multiple packages
     - crmsh.doc-base added for the interim; there is no index
     - crmsh-doc.install added to ensure copying of generated
       documentation to the correct destination
     - crmsh-doc.doc-base added for crmsh-doc package
     - DOC and HTML paths updated in debian/rules
     - Removed setting of HTML in rules as it's not necessary
     - Updated setting of DOC in rules to point to the correct
       location
    
    Change-Id: I0213dd5cd95b58cd5289bf6ff4c727befd377205
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 debian/control            | 29 ++++++++++++++++++++++-------
 debian/crmsh-doc.doc-base | 16 ++++++++++++++++
 debian/crmsh-doc.install  |  2 ++
 debian/crmsh.doc-base     |  7 +++++++
 debian/crmsh.install      |  4 ++++
 debian/rules              |  5 ++---
 6 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 6d5cfff..0e66c61 100644
--- a/debian/control
+++ b/debian/control
@@ -51,10 +51,25 @@ Recommends: pacemaker (>= 1.1.12)
 Replaces: pacemaker (<< 1.1.12)
 Breaks: pacemaker (<< 1.1.12)
 Description: CRM shell for the pacemaker cluster manager
- This package contains the famous CRM shell (crmsh) written by Dejan 
- Muhamedagic. Use it to manipulate the cluster information base (CIB)
- of a running pacemaker cluster without having to fiddle with XML 
- snippets. The CRM shell used to be part of the pacemaker package
- itself and became a separate project lately. If you are running a
- pacemaker cluster, then you should most definitely have this package
- installed.
+ The crm shell is an advanced command-line interface for High-Availability
+ cluster management in GNU/Linux. Effortlessly configure, manage and 
+ troubleshoot your clusters from the command line, with full tab completion
+ and extensive help. crmsh also provides advanced features like low-level 
+ cluster configuration, cluster scripting and package management, and 
+ history exploration tools giving you an instant view of what your cluster 
+ is doing.
+
+Package: crmsh-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: crmsh HTML Documentation
+ The crm shell is an advanced command-line interface for High-Availability
+ cluster management in GNU/Linux. Effortlessly configure, manage and 
+ troubleshoot your clusters from the command line, with full tab completion
+ and extensive help. crmsh also provides advanced features like low-level 
+ cluster configuration, cluster scripting and package management, and 
+ history exploration tools giving you an instant view of what your cluster 
+ is doing.
+ .
+ This package contains the html Pacemaker API documentation.
diff --git a/debian/crmsh-doc.doc-base b/debian/crmsh-doc.doc-base
new file mode 100644
index 0000000..92d225e
--- /dev/null
+++ b/debian/crmsh-doc.doc-base
@@ -0,0 +1,16 @@
+Document: crmsh-doc
+Title: crmsh complete HTML documentation
+Section: System/Administration
+
+Format: HTML
+Index: /usr/share/doc/crmsh-doc/html/index.html
+Files: /usr/share/doc/crmsh-doc/html/*.html
+ /usr/share/doc/crmsh-doc/html/*/*/*.html
+ /usr/share/doc/crmsh-doc/html/*/*.png
+ /usr/share/doc/crmsh-doc/html/*/*.gif
+ /usr/share/doc/crmsh-doc/html/*/*.css
+ /usr/share/doc/crmsh-doc/html/*/*.otf.gz
+ /usr/share/doc/crmsh-doc/html/*/*.eot.gz
+ /usr/share/doc/crmsh-doc/html/*/*.svg
+ /usr/share/doc/crmsh-doc/html/*/*.ttf.gz
+ /usr/share/doc/crmsh-doc/html/*/*.woff.gz
diff --git a/debian/crmsh-doc.install b/debian/crmsh-doc.install
new file mode 100644
index 0000000..a2633a6
--- /dev/null
+++ b/debian/crmsh-doc.install
@@ -0,0 +1,2 @@
+doc/website-v1/gen/* usr/share/doc/crmsh-doc/html
+debian/copyright usr/share/doc/crmsh-doc
diff --git a/debian/crmsh.doc-base b/debian/crmsh.doc-base
new file mode 100644
index 0000000..c9195d7
--- /dev/null
+++ b/debian/crmsh.doc-base
@@ -0,0 +1,7 @@
+Document: crmsh
+Title: crmsh HTML documentation
+Section: System/Administration
+
+Format: HTML
+Index: /usr/share/doc/crmsh/crm.8.html
+Files: /usr/share/doc/crmsh/*.html
diff --git a/debian/crmsh.install b/debian/crmsh.install
new file mode 100644
index 0000000..4027656
--- /dev/null
+++ b/debian/crmsh.install
@@ -0,0 +1,4 @@
+etc/crm/*
+usr/sbin/*
+usr/share/*
+usr/lib/python*/*-packages/crmsh/*
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 4548d9b..e62b9bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,15 +18,14 @@ override_dh_auto_configure:
 	    --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) --includedir=/usr/include/$(DEB_HOST_MULTIARCH) \
 	    --docdir=/usr/share/doc/crmsh --htmldir=/usr/share/doc/crmsh/html --with-asciidoc
 
-DOC = debian/crmsh/usr/share/doc/crmsh
-HTML = debian/crmsh/usr/share/doc/crmsh/html
-
 override_dh_auto_build:
 	dh_auto_build
 # Manually invoke building of the asciidoc html documentation
 	cd $(CURDIR)/doc/website-v1 && $(MAKE)
 	cd $(CURDIR)/../
 
+DOC = debian/tmp/usr/share/doc/crmsh
+
 override_dh_auto_install:
 	dh_auto_install
 # remove redundant COPYING files

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/crmsh.git