[sasview] 01/01: generate docs (using sphinx)

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository sasview.

commit 02bd2c182daf98057cddf8a33a64c2a5a7cd3b1a
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Oct 30 15:46:19 2017 +0800

    generate docs (using sphinx)
    
    html, info and man
---
 debian/control              |  6 ++++--
 debian/rules                | 17 ++++++++++-------
 debian/sasview-doc.doc-base | 14 ++++++++++++++
 debian/sasview-doc.docs     |  4 ++++
 debian/sasview-doc.info     |  1 +
 debian/sasview-docs.docs    |  3 ---
 debian/sasview.doc-base.EX  | 20 --------------------
 debian/sasview.manpages     |  1 +
 8 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index 4b0ab3a..e411768 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Drew Parsons <dparsons at debian.org>, Stuart Prescott <stuart at debian.org>
 Build-Depends: debhelper (>= 10), dh-python,
-    python-all, python-setuptools
+    python-all, python-setuptools,
+    texinfo
 Standards-Version: 4.1.1
 Homepage: http://www.sasview.org/
 X-Python-Version: >= 2.6
@@ -34,7 +35,7 @@ Description: Small Angle Scattering Analysis (Python 2)
  (Porod) invariant ('total scattering'), and distance distribution
  functions.
  .
- This package installs the executable script, /usr/bin/sasview.
+ This package installs the sasview executable script.
 
 Package: python-sasview
 Architecture: all
@@ -59,6 +60,7 @@ Description: Small Angle Scattering Analysis (Python 2)
  functions.
  .
  This package installs the library for Python 2.
+
 #Package: python3-sasview
 #Architecture: all
 #Depends: ${python3:Depends}, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index dfda7f0..28deca7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,16 +6,19 @@
 export PYBUILD_NAME=sasview
 
 %:
-	dh $@ --with python2 --buildsystem=pybuild
+	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
 
 override_dh_install:
 	dh_install
 	mv debian/python-sasview/usr/bin/sasview debian/sasview/usr/bin/sasview
 
-# If you need to rebuild the Sphinx documentation
-# Add spinxdoc to the dh --with line
-#override_dh_auto_build:
-#	dh_auto_build
-#	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml        docs/ build/html # HTML generator
-#	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bman        docs/ build/man # Manpage generator
+override_dh_auto_build:
+	dh_auto_build
+	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml        docs/sphinx-docs/source/ build/html # HTML generator
+	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -btexinfo        docs/sphinx-docs/source/ build/info # Info generator
+	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bman        docs/sphinx-docs/source/ build/man # Manpage generator
+
+override_dh_installinfo:
+	cd build/info; makeinfo SasView.texi
+	dh_installinfo
 
diff --git a/debian/sasview-doc.doc-base b/debian/sasview-doc.doc-base
new file mode 100644
index 0000000..50d6069
--- /dev/null
+++ b/debian/sasview-doc.doc-base
@@ -0,0 +1,14 @@
+Document: SasView
+Title: SasView Manual
+Author: Paul Kienzle <pkienzle at nist.gov>
+Abstract: This manual describes what python-bumps is
+ and how it can be used. A tutorial is included.
+Section: Science/Data Analysis
+
+Format: Info
+Index: /usr/share/info/bumps.info.gz
+Files: /usr/share/info/bumps.info*.gz
+
+Format: HTML
+Index: /usr/share/doc/python-bumps-doc/html/index.html
+Files: /usr/share/doc/python-bumps-doc/html/*.html
diff --git a/debian/sasview-doc.docs b/debian/sasview-doc.docs
new file mode 100644
index 0000000..4fa574d
--- /dev/null
+++ b/debian/sasview-doc.docs
@@ -0,0 +1,4 @@
+README.Debian
+README.source
+docs/sasview/Tutorial.*
+build/html
diff --git a/debian/sasview-doc.info b/debian/sasview-doc.info
new file mode 100644
index 0000000..fa8f328
--- /dev/null
+++ b/debian/sasview-doc.info
@@ -0,0 +1 @@
+build/info/SasView.info
diff --git a/debian/sasview-docs.docs b/debian/sasview-docs.docs
deleted file mode 100644
index 409c22e..0000000
--- a/debian/sasview-docs.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-README.Debian
-README.source
-docs/sasview/Tutorial.*
\ No newline at end of file
diff --git a/debian/sasview.doc-base.EX b/debian/sasview.doc-base.EX
deleted file mode 100644
index 10636c8..0000000
--- a/debian/sasview.doc-base.EX
+++ /dev/null
@@ -1,20 +0,0 @@
-Document: sasview
-Title: Debian sasview Manual
-Author: <insert document author here>
-Abstract: This manual describes what sasview is
- and how it can be used to
- manage online manuals on Debian systems.
-Section: unknown
-
-Format: debiandoc-sgml
-Files: /usr/share/doc/sasview/sasview.sgml.gz
-
-Format: postscript
-Files: /usr/share/doc/sasview/sasview.ps.gz
-
-Format: text
-Files: /usr/share/doc/sasview/sasview.text.gz
-
-Format: HTML
-Index: /usr/share/doc/sasview/html/index.html
-Files: /usr/share/doc/sasview/html/*.html
diff --git a/debian/sasview.manpages b/debian/sasview.manpages
new file mode 100644
index 0000000..e42cd92
--- /dev/null
+++ b/debian/sasview.manpages
@@ -0,0 +1 @@
+build/man/sasview.1

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