[Pkg-octave-commit] [octave-interval] 02/04: Change doc format from PDF to HTML

Oliver Heimlich oheim-guest at moszumanska.debian.org
Sun Apr 24 19:25:58 UTC 2016


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 ca80139471a16ab632b83a02fee7cf394e6b20aa
Author: Oliver Heimlich <oheim at posteo.de>
Date:   Sun Apr 24 20:45:17 2016 +0200

    Change doc format from PDF to HTML
---
 .gitignore                      |  1 +
 debian/octave-interval.doc-base |  5 +++--
 debian/octave-interval.docs     |  2 +-
 debian/rules                    | 15 +++++++++++----
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31da07e..453e476 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /doc/manual.aux
 /doc/manual.cp
 /doc/manual.fn
+/doc/manual.html
 /doc/manual.ky
 /doc/manual.log
 /doc/manual.pdf
diff --git a/debian/octave-interval.doc-base b/debian/octave-interval.doc-base
index 7e73390..57f51f7 100644
--- a/debian/octave-interval.doc-base
+++ b/debian/octave-interval.doc-base
@@ -4,5 +4,6 @@ Author: Oliver Heimlich
 Abstract: Documentation for the Interval Package for GNU Octave
 Section: Science/Mathematics
 
-Format: PDF
-Files: /usr/share/doc/octave-interval/manual.pdf.gz
+Format: HTML
+Index: /usr/share/doc/octave-interval/manual.html
+Files: /usr/share/doc/octave-interval/*.html /usr/share/doc/octave-interval/image/*
diff --git a/debian/octave-interval.docs b/debian/octave-interval.docs
index 56a14e1..bad280c 100644
--- a/debian/octave-interval.docs
+++ b/debian/octave-interval.docs
@@ -1 +1 @@
-doc/manual.pdf
+doc/manual.html
diff --git a/debian/rules b/debian/rules
index 6986d8e..6c85448 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,16 +20,23 @@
 include /usr/share/cdbs/1/class/octave-pkg.mk
 
 pkg = $(shell awk '/^Name:/ {print $$2; exit 0}' DESCRIPTION)
+
+# FIXME: This should go into octave-pkg.m
 DEB_DH_GENCONTROL_ARGS_ALL = -- -Vsource:Upstream-Description="$(shell grep --perl-regexp --only-matching --null-data '(?<=^Description:) .*(\n .*|\n$$)*' DESCRIPTION | sed -e 's/^\s*//' | sed --null-data -e 's/\n/\\$${Newline}/g')"
 DEB_DH_INSTALL_SOURCEDIR = debian/octave-$(pkg)
+doc_image_dir = $(DEB_DH_INSTALL_SOURCEDIR)/usr/share/doc/$(package)/image
 
-install-docs: build-docs
-build-docs:: install-pkg
+install-docs:
 	# 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.pdf
+		make -C doc manual.html
+	rm -rf $(debpkg)/$(mpath)/*/doc
+	# 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)/"
 
 clean::
 	( cd doc ; \
-	  rm -f *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr manual.pdf image/*.m.png )
+	  rm -f *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr manual.html image/*.m.png )

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



More information about the Pkg-octave-commit mailing list