summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Shadura <andrew.shadura@collabora.co.uk>2019-01-07 18:23:52 +0100
committerAndrej Shadura <andrew.shadura@collabora.co.uk>2019-01-07 18:23:52 +0100
commit5ea4b16418b4ef399046b2aba29fa6daa28f7714 (patch)
tree5061c12779e8a91be2af14f6d0e2db6fd7beb8d5
parentdd26c0ca5a94fbe0bf40b07169152cdd5485a107 (diff)
Refresh the patch
-rw-r--r--debian/patches/01-fix-sphinxdoc-conf.patch12
-rw-r--r--docs/conf.py10
2 files changed, 11 insertions, 11 deletions
diff --git a/debian/patches/01-fix-sphinxdoc-conf.patch b/debian/patches/01-fix-sphinxdoc-conf.patch
index 54ee370..91680f6 100644
--- a/debian/patches/01-fix-sphinxdoc-conf.patch
+++ b/debian/patches/01-fix-sphinxdoc-conf.patch
@@ -5,14 +5,14 @@ Author: Andrew Shadura <andrewsh@debian.org>
+++ b/docs/conf.py
@@ -19,7 +19,7 @@
- import sys, os
+ import datetime
import pkg_resources
-import pylons_sphinx_themes
+# import pylons_sphinx_themes
# General configuration
# ---------------------
-@@ -47,7 +47,7 @@
+@@ -53,7 +53,7 @@
# other places throughout the built documents.
#
# The short X.Y version.
@@ -21,16 +21,16 @@ Author: Andrew Shadura <andrewsh@debian.org>
# The full version, including alpha/beta/rc tags.
release = version
-@@ -89,9 +89,9 @@
+@@ -98,9 +98,9 @@
# -----------------------
# Add and use Pylons theme
-html_theme = 'pylons'
-html_theme_path = pylons_sphinx_themes.get_html_themes_path()
--html_theme_options = dict(github_url='http://github.com/Pylons/waitress')
+-html_theme_options = dict(github_url='https://github.com/Pylons/waitress')
+# html_theme = 'pylons'
-+# html_theme_path = # pylons_sphinx_themes.get_html_themes_path()
-+# html_theme_options = dict(github_url='http://github.com/Pylons/waitress')
++# html_theme_path = pylons_sphinx_themes.get_html_themes_path()
++# html_theme_options = dict(github_url='https://github.com/Pylons/waitress')
# The style sheet to use for HTML and HTML Help pages. A file of that name
# must exist either in Sphinx' static/ path, or in one of the custom paths
diff --git a/docs/conf.py b/docs/conf.py
index c04eaa3..19fc33c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,7 +19,7 @@
import datetime
import pkg_resources
-import pylons_sphinx_themes
+# import pylons_sphinx_themes
# General configuration
# ---------------------
@@ -53,7 +53,7 @@ copyright = '2012-%s, Agendaless Consulting <chrism@plope.com>' % thisyear
# other places throughout the built documents.
#
# The short X.Y version.
-version = pkg_resources.get_distribution('waitress').version
+version = '1.0.1'
# The full version, including alpha/beta/rc tags.
release = version
@@ -98,9 +98,9 @@ smartquotes = False
# -----------------------
# Add and use Pylons theme
-html_theme = 'pylons'
-html_theme_path = pylons_sphinx_themes.get_html_themes_path()
-html_theme_options = dict(github_url='https://github.com/Pylons/waitress')
+# html_theme = 'pylons'
+# html_theme_path = pylons_sphinx_themes.get_html_themes_path()
+# html_theme_options = dict(github_url='https://github.com/Pylons/waitress')
# The style sheet to use for HTML and HTML Help pages. A file of that name
# must exist either in Sphinx' static/ path, or in one of the custom paths