[Python-modules-commits] [terminaltables] 08/10: merge patched into master

[Carl Suster]

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

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

commit bfde75f2ca742abdc10fb69bf5b85e5de54a81cc
Merge: 0d5d27d cfa3c98
Author: Carl Suster <carl at contraflo.ws>
Date:   Sat Jan 7 14:41:41 2017 +1100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0002-enable-Sphinx-html_copy_source.patch      | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 99c3c2c,0000000..6975e1e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 90fce8ef39a64de4e29bb0b1bd9acb25d4831066
- 90fce8ef39a64de4e29bb0b1bd9acb25d4831066
++cfa3c98c9b56afa3b126ac216fb09236cbf2c2c3
++cfa3c98c9b56afa3b126ac216fb09236cbf2c2c3
 +f687517a78f1a2cda5e071df2dfd71fcbf1a1588
 +f687517a78f1a2cda5e071df2dfd71fcbf1a1588
 +terminaltables-3.1.0.orig.tar.gz
 +4746c1d8b85e056640299ea8e1d41c8e36679824
 +278484
diff --cc debian/patches/0002-enable-Sphinx-html_copy_source.patch
index 0000000,0000000..e284ffb
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-enable-Sphinx-html_copy_source.patch
@@@ -1,0 -1,0 +1,27 @@@
++From cfa3c98c9b56afa3b126ac216fb09236cbf2c2c3 Mon Sep 17 00:00:00 2001
++From: Carl Suster <carl at contraflo.ws>
++Date: Sat, 7 Jan 2017 14:39:14 +1100
++Subject: enable Sphinx html_copy_source
++
++We would like for the HTML source files to be installed, and they are
++needed for the search page. In theory this could be done by passing an
++argument `-Dhtml_copy_source=1` in debian/rules, however this causes
++HAS_SOURCE to be equal to 1 instead of True so dh_sphinxdoc fails with a
++"doesn't look like a Sphinc search page" error.
++---
++ docs/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 7580d0c..12ab980 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -26,7 +26,7 @@ html_context = dict(
++     github_version=os.environ.get('TRAVIS_BRANCH', 'master'),
++     source_suffix='.rst',
++ )
++-html_copy_source = False
+++html_copy_source = True
++ html_favicon = 'favicon.ico'
++ html_theme = 'sphinx_rtd_theme'
++ html_title = project
diff --cc debian/patches/series
index c950b2d,0000000..32c2281
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-remove-sphinxcontrib.googleanalytics.patch
++0002-enable-Sphinx-html_copy_source.patch

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