[Python-modules-commits] [flask-login] 01/02: Improve sphinx documentation building

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository flask-login.

commit 9a97a095389b7817511778b84a940a586a45ba6a
Author: Carl Suster <carl at contraflo.ws>
Date:   Mon Jan 9 17:03:42 2017 +1100

    Improve sphinx documentation building
    
    - Avoid compressing html/ files
    - Set up Recommends and Suggests between doc and main package
    - Also block https requests during build
---
 debian/control | 2 ++
 debian/rules   | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 6a953ee..5af8224 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Vcs-Browser: https://anonscm.debian.org/git/python-modules/packages/flask-login.
 Package: python3-flask-login
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
+Suggests: python3-flask-login-doc
 Description: user session management for Flask -- Python 3 module
  Flask-Login provides user session management for Flask. It handles the
  common tasks of logging in, logging out, and remembering your users'
@@ -37,6 +38,7 @@ Package: python3-flask-login-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Recommends: python3-flask-login
 Description: user session management for Flask -- documentation
  Flask-Login provides user session management for Flask. It handles the
  common tasks of logging in, logging out, and remembering your users'
diff --git a/debian/rules b/debian/rules
index f74e401..ea1cde3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,11 @@ export PYBUILD_NAME=flask-login
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem pybuild
 
+override_dh_sphinxdoc: http_proxy=127.0.0.1:9
+override_dh_sphinxdoc: https_proxy=127.0.0.1:9
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	http_proxy='http://127.0.0.1:9/' PYTHONPATH=. sphinx-build -N -q -E -b html docs/ debian/python3-flask-login-doc/usr/share/doc/python3-flask-login-doc/html/
+	PYTHONPATH=. sphinx-build -N -q -E -b html docs/ debian/python3-flask-login-doc/usr/share/doc/python3-flask-login-doc/html/
 	dh_sphinxdoc
 endif
 
@@ -17,3 +19,6 @@ override_dh_auto_test:
 	# NB: NOCOLOR can be removed if a B-D on
 	# python3-nose-yanc is added (See #850589)
 	NOCOLOR=1 NOSETEST=nosetests3 make test
+
+override_dh_compress:
+	dh_compress -X html/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/flask-login.git