[Python-modules-commits] [celery] 07/13: Fix documentation build:

[Michael Fladischer]

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

fladi pushed a commit to branch debian/master
in repository celery.

commit fbcdf01ccbf3deab19ad9421b9937cb995f0c979
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Jul 31 12:46:35 2017 +0200

    Fix documentation build:
    
    * Fix documentation build:
      - Switch to python2-sphinx.
      - Add python2-sphinx-celery to Build-Depends.
      - Bump versioned dependency on kombu.
      - Update doc-base registration.
---
 debian/changelog                  |  5 +++++
 debian/control                    |  7 ++++---
 debian/python-celery-doc.doc-base | 31 ++++++++++++++++++-------------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6b9d22..96f1633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ celery (4.1.0-1~exp1) UNRELEASED; urgency=low
   * Add new upstream signing key.
   * Refresh patches for 4.1.0.
   * Bump Standards-Version to 4.0.0.
+  * Fix documentation build:
+    - Switch to python2-sphinx.
+    - Add python2-sphinx-celery to Build-Depends.
+    - Bump versioned dependency on kombu.
+    - Update doc-base registration.
 
   [ Brian May ]
   * Apply upstream patch to allow Sphinx to strip memory addresses.
diff --git a/debian/control b/debian/control
index b134bf8..bc70e18 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
                python-dateutil (>= 1.5),
                python-doc,
                python-gevent,
-               python-kombu (>= 3.0.34),
+               python-kombu (>= 4.0.2+really4.0.2),
                python-kombu-doc,
                python-mailer,
                python-memcache,
@@ -25,7 +25,6 @@ Build-Depends: debhelper (>= 9),
                python-pytyrant,
                python-redis,
                python-setuptools,
-               python-sphinx (>= 1.0.7+dfsg),
                python-sqlalchemy,
                python-tz,
                python-unittest2,
@@ -33,7 +32,7 @@ Build-Depends: debhelper (>= 9),
                python3-billiard (>= 3.3.0.23),
                python3-dateutil,
                python3-doc,
-               python3-kombu (>= 3.0.34),
+               python3-kombu (>= 4.0.2+really4.0.2),
                python3-memcache,
                python3-mock (>= 1.0.1),
                python3-nose,
@@ -41,6 +40,8 @@ Build-Depends: debhelper (>= 9),
                python3-pyparsing,
                python3-redis,
                python3-setuptools,
+               python3-sphinx,
+               python3-sphinx-celery,
                python3-sqlalchemy,
                python3-tz,
                texlive-latex-base,
diff --git a/debian/python-celery-doc.doc-base b/debian/python-celery-doc.doc-base
index 88ec9f7..88ccbc2 100644
--- a/debian/python-celery-doc.doc-base
+++ b/debian/python-celery-doc.doc-base
@@ -6,24 +6,29 @@ Section: Programming/Python
 Format: HTML
 Index: /usr/share/doc/python-celery-doc/html/index.html
 Files: /usr/share/doc/python-celery-doc/html/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/billiard/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/app/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/apps/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/backends/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/bin/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/concurrency/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/contrib/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/events/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/loaders/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/security/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/utils/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/celery/worker/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/kombu/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/kombu/async/*.html
+       /usr/share/doc/python-celery-doc/html/_modules/sqlalchemy/orm/*.html
        /usr/share/doc/python-celery-doc/html/django/*.html
        /usr/share/doc/python-celery-doc/html/getting-started/*.html
+       /usr/share/doc/python-celery-doc/html/getting-started/brokers/*.html
        /usr/share/doc/python-celery-doc/html/history/*.html
        /usr/share/doc/python-celery-doc/html/internals/*.html
        /usr/share/doc/python-celery-doc/html/internals/reference/*.html
        /usr/share/doc/python-celery-doc/html/reference/*.html
        /usr/share/doc/python-celery-doc/html/tutorials/*.html
        /usr/share/doc/python-celery-doc/html/userguide/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/utils/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/bin/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/backends/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/task/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/worker/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/concurrency/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/loaders/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/security/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/app/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/contrib/*.html
-       /usr/share/doc/python-celery-doc/html/_modules/celery/events/*.html

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