[guiqwt] 02/04: refresh the rules file to build documentation only when requested

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository guiqwt.

commit 2bd3e2ea2806c7650ca25a80fb73c8c75bba5866
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Aug 21 09:06:04 2016 +0200

    refresh the rules file to build documentation only when requested
---
 debian/changelog |  9 +++++++++
 debian/control   |  4 ++--
 debian/rules     | 11 +++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1310f78..d67eb74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+guiqwt (3.0.2-2) unstable; urgency=medium
+
+  * Use cme to fix the packaging
+  * Update the Homepage
+  * make the build reproducible (Closes: #807605)
+    thanks Chris Lamb for the patch
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 21 Aug 2016 08:56:32 +0200
+
 guiqwt (3.0.2-1) unstable; urgency=medium
 
   * Imported Upstream version 3.0.2
diff --git a/debian/control b/debian/control
index 6e0e692..7dc505d 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,6 @@ Depends: python-guidata (>= 1.7.0~),
          ${misc:Depends},
          ${python:Depends},
          ${shlibs:Depends},
-         ${sphinxdoc:Depends}
 Recommends: python-dicom
 Suggests: spyder
 Provides: ${python:Provides}
@@ -73,7 +72,8 @@ Description: efficient 2D data-plotting library - Python 3
 Package: python-guiqwt-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${sphinxdoc:Depends}
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends}
 Breaks: python-guiqwt (<< 2.4.0~b2-1~exp2)
 Replaces: python-guiqwt (<< 2.4.0~b2-1~exp2)
 Description: efficient 2D data-plotting library - Documentation
diff --git a/debian/rules b/debian/rules
index ff781c5..8e70757 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ export PYBUILD_BUILD_ARGS=--no-doc
 override_dh_clean:
 	# remove the cython generated files distributed by upstream
 	rm -f $(patsubst %.pyx,%.c,$(wildcard src/*.pyx))
-	rm -rf build
+	rm -rf doc/build
 	dh_clean
 
 override_dh_auto_install:
@@ -26,7 +26,10 @@ override_dh_auto_install:
 	# install the qtdesigner files
 	dh_install -p python-guiqwt qtdesigner/*.py /usr/lib/qt4/plugins/designer/python
 
-override_dh_auto_build:
-	dh_auto_build
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	PYBUILD_SYSTEM=custom \
-	PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' sphinx-build -N -bhtml doc build/html" dh_auto_build  # HTML generator
+	PYBUILD_BUILD_ARGS="cd doc && PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' {interpreter} -c \"import sys;from sphinx import main;sys.exit(main(sys.argv))\" -N -bhtml . build/html" dh_auto_build  # HTML generator
+	dh_installdocs "doc/build/html" -p python-guiqwt-doc
+	dh_sphinxdoc -O--buildsystem=pybuild
+endif

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