[Pkg-octave-commit] [octave-interval] 01/01: Split binary package into separate documentation package

[Oliver Heimlich]

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

oheim-guest pushed a commit to branch master
in repository octave-interval.

commit 9d2eb8648c4f3bc4a8459c01e4eaa83306633f23
Author: Oliver Heimlich <oheim at posteo.de>
Date:   Thu Jun 9 23:24:29 2016 +0200

    Split binary package into separate documentation package
---
 debian/control                                         | 18 ++++++++++++++++--
 ...-interval.doc-base => octave-interval-doc.doc-base} |  0
 debian/octave-interval.docs                            |  1 -
 debian/rules                                           | 12 +++++++-----
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 249c9e2..b5b9337 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,10 @@ Section: math
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Oliver Heimlich <oheim at posteo.de>,
+Build-Depends-Indep: texinfo, texlive, texlive-generic-recommended,
+ imagemagick, gnuplot-nox,
 Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.4.0),
- libmpfr-dev (>= 3.1.0), texinfo, texlive, texlive-generic-recommended,
- imagemagick, gnuplot-nox
+ libmpfr-dev (>= 3.1.0),
 Standards-Version: 3.9.8
 Homepage: http://octave.sourceforge.net/interval/
 Vcs-Git: https://anonscm.debian.org/git/pkg-octave/octave-interval.git
@@ -14,6 +15,19 @@ Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-octave/octave-interval.git
 Package: octave-interval
 Architecture: any
 Depends: ${misc:Depends}, ${octave:Depends}, ${shlibs:Depends},
+Suggests: octave-interval-doc
 Description: real-valued interval arithmetic for Octave
  ${octave:Upstream-Description}
  This Octave add-on package is part of the Octave-Forge project.
+
+Section: doc
+Package: octave-interval-doc
+Architecture: all
+Depends: w3m | www-browser
+Enhances: octave-interval
+Description: real-valued interval arithmetic for Octave (arch-indep files)
+ ${octave:Upstream-Description}
+ This Octave add-on package is part of the Octave-Forge project.
+ .
+ This package provides a documentation in html format for the octave-interval
+ package.
diff --git a/debian/octave-interval.doc-base b/debian/octave-interval-doc.doc-base
similarity index 100%
rename from debian/octave-interval.doc-base
rename to debian/octave-interval-doc.doc-base
diff --git a/debian/octave-interval.docs b/debian/octave-interval.docs
deleted file mode 100644
index bad280c..0000000
--- a/debian/octave-interval.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/manual.html
diff --git a/debian/rules b/debian/rules
index 7bcb64d..d4d4072 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,18 +22,20 @@ include /usr/share/cdbs/1/class/octave-pkg.mk
 pkg = $(shell awk '/^Name:/ {print $$2; exit 0}' DESCRIPTION)
 pkg_version = $(shell awk '/^Version:/ {print $$2; exit 0}' DESCRIPTION)
 
-DEB_DH_INSTALL_SOURCEDIR = debian/octave-$(pkg)
-doc_image_dir = $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/doc/$(package)/image
+# Don't install NEWS.gz, octave-pkg-dev will handle this
+DEB_INSTALL_DOCS_ALL =
+doc_dir = $(CURDIR)/$(debpkg)-doc/usr/share/doc/$(package)
 
-install-docs::
+install/$(package)-doc:: install/$(package)
 	# The documentation build needs to load the package,
 	# so we have to set paths for the build process.
 	OCTAVE="$(octave) $(octave_options) --eval \"pkg ('prefix', [pwd(),'/../$(debpkg)/$(mpath)'], [pwd(),'/../$(debpkg)/$(bpath)']); pkg ('local_list', [pwd(),'/../local-list']); pkg ('global_list', [pwd(),'/../global-list']); pkg ('load', '$(pkg)');\"" \
 		make -C doc manual.html
 	# dh_installdocs does not support subdirectories,
 	# so we move everything in place
-	mkdir -p "$(doc_image_dir)"
-	cp doc/image/*.png doc/image/*.svg "$(doc_image_dir)/"
+	mkdir -p $(doc_dir)/image
+	cp doc/manual.html $(doc_dir)/
+	cp doc/image/*.png doc/image/*.svg $(doc_dir)/image/
 
 remove-dirs::
 	rm -rf \

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-interval.git