[Python-modules-commits] [python-webob] 05/05: New upstream release.

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository python-webob.

commit a2476ff9be119b7b94ecc70da6051bd62c924c1b
Author: Barry Warsaw <barry at python.org>
Date:   Tue Jul 12 11:12:55 2016 -0400

    New upstream release.
    
      * New upstream release.
      * d/patches/intersphinx-local.patch: Use local documentation for
        intersphinx, preventing build-time access to the internet.
        (Closes: #830611)
      * d/rules: Build the Sphinx documentation under the
        override_dh_sphinxdoc rule rather than override_dh_installdocs.
      * d/control:
        - Add dependencies to python-doc and python3-doc for local intersphinx
          links.
        - Bump Standards-Version with no other changes needed.
        - wrap-and-sort
      * d/tests: Remove, since autodep8 will do these tests for us.
---
 debian/changelog     | 17 +++++++++++++++++
 debian/control       |  6 ++++--
 debian/rules         |  7 ++++---
 debian/tests/control |  3 ---
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d55fea..0c76bd3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+python-webob (1.6.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * d/patches/intersphinx-local.patch: Use local documentation for
+    intersphinx, preventing build-time access to the internet.
+    (Closes: #830611)
+  * d/rules: Build the Sphinx documentation under the
+    override_dh_sphinxdoc rule rather than override_dh_installdocs.
+  * d/control:
+    - Add dependencies to python-doc and python3-doc for local intersphinx
+      links.
+    - Bump Standards-Version with no other changes needed.
+    - wrap-and-sort
+  * d/tests: Remove, since autodep8 will do these tests for us.
+
+ -- Barry Warsaw <barry at debian.org>  Tue, 12 Jul 2016 11:03:10 -0400
+
 python-webob (1.6.0-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff --git a/debian/control b/debian/control
index 380706d..0b2c6e2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,15 @@ Uploaders: Piotr Ożarowski <piotr at debian.org>,
            Thomas Goirand <zigo at debian.org>
 Build-Depends: debhelper (>= 9), dh-python
 Build-Depends-Indep: python-all (>= 2.6.6-3),
+                     python-doc,
                      python-nose,
                      python-setuptools (>= 0.6b3-1~),
                      python-sphinx (>= 1.0.7+dfsg-1~),
                      python3-all,
+                     python3-doc,
                      python3-nose,
                      python3-setuptools
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Homepage: http://webob.org/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-webob.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-webob.git
@@ -51,7 +53,7 @@ Description: Python module providing WSGI request and response objects (Python 3
 Package: python-webob-doc
 Architecture: all
 Section: doc
-Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Suggests: libjs-jquery
 Description: Python module providing WSGI request and response objects (documentation)
  WebOb provides wrappers around the WSGI request environment, and an object to
diff --git a/debian/rules b/debian/rules
index 082d815..46c4675 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,9 @@ override_dh_auto_test:
 override_dh_installchangelogs:
 	dh_installchangelogs -k CHANGES.txt
 
-override_dh_installdocs:
-	dh_installdocs
-	[ -d docs/_static ] || mkdir docs/_static # Sphinx needs it
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	PYTHONPATH=. sphinx-build -N -q -E -b html docs/ \
 		     debian/python-webob-doc/usr/share/doc/python-webob-doc/
+	dh_sphinxdoc
+endif
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 668490f..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,3 +0,0 @@
-Test-Command: python -c "import webob; print webob"
-
-Test-Command: python3 -c "import webob; print(webob)"

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