[cpl-plugin-xsh] 04/08: Move documentation into separate package.

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-xsh.

commit 612fc70bd5ebb948101d20b12714047c230a76bc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Dec 30 09:45:44 2013 +0100

    Move documentation into separate package.
---
 debian/control                                        | 14 ++++++++++++--
 ...-plugin.doc-base.in => cpl-plugin-doc.doc-base.in} |  4 ++--
 debian/{cpl-plugin.docs.in => cpl-plugin-doc.docs.in} |  0
 ...-plugin.manpages.in => cpl-plugin-doc.manpages.in} |  0
 debian/rules                                          | 19 ++++++++++++-------
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index ed63e22..9ef51f7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9),
                python-cpl,
                python-pyfits,
                python-sphinx
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.eso.org/sci/software/pipelines/template
 Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-template.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-template.git
@@ -18,7 +18,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-templat
 Package: cpl-plugin-template
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: esorex|python-cpl
+Recommends: esorex|python-cpl, cpl-plugin-template-doc
 Suggests: cpl-plugin-template-calib
 Multi-Arch: same
 Description: ESO data reduction pipeline template
@@ -28,6 +28,16 @@ Description: ESO data reduction pipeline template
  This package is used as a template for the other ESO recipes. It is not
  meant to built as a package.
 
+Package: cpl-plugin-template-doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Section: doc
+Description: ESO data reduction pipeline documentation template
+ This package contains the HTML documentation and manpages for the data
+ reduction pipeline for the Template instrument of the Very Large Telescope
+ (VLT) from the European Southern Observatory (ESO).
+
 Package: cpl-plugin-template-calib
 Architecture: all
 Multi-Arch: foreign
diff --git a/debian/cpl-plugin.doc-base.in b/debian/cpl-plugin-doc.doc-base.in
similarity index 85%
rename from debian/cpl-plugin.doc-base.in
rename to debian/cpl-plugin-doc.doc-base.in
index 3e4426b..d709837 100644
--- a/debian/cpl-plugin.doc-base.in
+++ b/debian/cpl-plugin-doc.doc-base.in
@@ -12,5 +12,5 @@ Abstract: The __PIPELINE__ pipeline is a subsystem of the Data Flow System
  This document describes the Python interface for the  __PIPELINE__ pipeline.
 
 Format: HTML
-Index: /usr/share/doc/cpl-plugin-__PIPELINE__/html/index.html
-Files: /usr/share/doc/cpl-plugin-__PIPELINE__/html/*
+Index: /usr/share/doc/cpl-plugin-__PIPELINE__-doc/html/index.html
+Files: /usr/share/doc/cpl-plugin-__PIPELINE__-doc/html/*
diff --git a/debian/cpl-plugin.docs.in b/debian/cpl-plugin-doc.docs.in
similarity index 100%
rename from debian/cpl-plugin.docs.in
rename to debian/cpl-plugin-doc.docs.in
diff --git a/debian/cpl-plugin.manpages.in b/debian/cpl-plugin-doc.manpages.in
similarity index 100%
rename from debian/cpl-plugin.manpages.in
rename to debian/cpl-plugin-doc.manpages.in
diff --git a/debian/rules b/debian/rules
index 49e7b00..0047502 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,10 +15,10 @@ get-orig-source:
 
 debian_files:
 	if [ -d calib/cal ] ; then \
-	    dfiles=".install .manpages .docs .doc-base -calib.install" ; \
+	    dfiles=".install -doc.manpages -doc.docs -doc.doc-base -calib.install" ; \
 	else \
 	    cp -f debian/README.Debian.in debian/README.Debian ; \
-	    dfiles=".install .manpages .docs .doc-base -calib.postinst -calib.prerm -calib.lintian-overrides" ; \
+	    dfiles=".install -doc.manpages -doc.docs -doc.doc-base -calib.postinst -calib.prerm -calib.lintian-overrides" ; \
 	fi ; \
 	for f in $$dfiles ; do \
 	    sed "s/__VERSION__/$(VERSION)/g;s/__PIPELINE__/${PIPELINE}/g" \
@@ -29,23 +29,28 @@ debian_files:
 override_dh_install: debian_files
 	dh_install
 
-override_dh_installman:
+override_dh_installman-indep:
 	mkdir -p man
 	python debian/create_manpage.py ${PIPELINE}
 	dh_installman
 
-override_dh_installdocs:
+override_dh_installdocs-indep:
 	mkdir -p sphinx
 	python debian/create_sphinx.py ${PIPELINE}
 	sphinx-build sphinx sphinx/html
 	dh_installdocs
 
+override_dh_sphinxdoc:
+	if [ -d sphinx ] ; then \
+		dh_sphinxdoc ; \
+	fi
+
 override_dh_clean:
 	dh_clean
 	rm -rf debian/${DEBPKGNAME}.install \
-               debian/${DEBPKGNAME}.manpages \
-               debian/${DEBPKGNAME}.docs \
-               debian/${DEBPKGNAME}.doc-base \
+               debian/${DEBPKGNAME}-doc.manpages \
+               debian/${DEBPKGNAME}-doc.docs \
+               debian/${DEBPKGNAME}-doc.doc-base \
 	       debian/${DEBPKGNAME}-calib.lintian-overrides \
 	       debian/${DEBPKGNAME}-calib.install \
 	       debian/${DEBPKGNAME}-calib.postinst \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-xsh.git