[Python-modules-commits] [terminaltables] 03/05: 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 f51e9f0cd3a2649ea7dae8d34688476e6b2408f4
Merge: e0f2da0 7d3174d
Author: Carl Suster <carl at contraflo.ws>
Date:   Thu Jan 12 14:39:33 2017 +1100

    merge patched into master

 debian/.git-dpm                                                | 4 ++--
 debian/patches/0001-remove-sphinxcontrib.googleanalytics.patch | 4 +++-
 debian/patches/0002-enable-Sphinx-html_copy_source.patch       | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 6975e1e,0000000..c678c91
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
- cfa3c98c9b56afa3b126ac216fb09236cbf2c2c3
- cfa3c98c9b56afa3b126ac216fb09236cbf2c2c3
++7d3174df83fd37b4cdcd23487cbcc5f2a7ce797b
++7d3174df83fd37b4cdcd23487cbcc5f2a7ce797b
 +f687517a78f1a2cda5e071df2dfd71fcbf1a1588
 +f687517a78f1a2cda5e071df2dfd71fcbf1a1588
 +terminaltables-3.1.0.orig.tar.gz
 +4746c1d8b85e056640299ea8e1d41c8e36679824
 +278484
diff --cc debian/patches/0001-remove-sphinxcontrib.googleanalytics.patch
index 1482e98,0000000..cbb09bd
mode 100644,000000..100644
--- a/debian/patches/0001-remove-sphinxcontrib.googleanalytics.patch
+++ b/debian/patches/0001-remove-sphinxcontrib.googleanalytics.patch
@@@ -1,26 -1,0 +1,28 @@@
- From 90fce8ef39a64de4e29bb0b1bd9acb25d4831066 Mon Sep 17 00:00:00 2001
++From f6b5f27a750011b2c2b26e1a2152330051f8afbc Mon Sep 17 00:00:00 2001
 +From: Carl Suster <carl at contraflo.ws>
 +Date: Sat, 7 Jan 2017 13:04:55 +1100
 +Subject: remove sphinxcontrib.googleanalytics
 +
 +Disable Google Analytics extension for building the documentation with
 +Sphinx.
++
++Forwarded: no
 +---
 + docs/conf.py | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index fb33f09..7580d0c 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -42,8 +42,8 @@ extlinks = {'github': ('https://github.com/robpol86/{0}/blob/v{1}/%s'.format(pro
 + 
 + 
 + # google analytics
 +-extensions.append('sphinxcontrib.googleanalytics')
 +-googleanalytics_id = 'UA-82627369-1'
 ++# extensions.append('sphinxcontrib.googleanalytics')
 ++# googleanalytics_id = 'UA-82627369-1'
 + 
 + 
 + # SCVersioning.
diff --cc debian/patches/0002-enable-Sphinx-html_copy_source.patch
index e284ffb,0000000..437220f
mode 100644,000000..100644
--- a/debian/patches/0002-enable-Sphinx-html_copy_source.patch
+++ b/debian/patches/0002-enable-Sphinx-html_copy_source.patch
@@@ -1,27 -1,0 +1,29 @@@
- From cfa3c98c9b56afa3b126ac216fb09236cbf2c2c3 Mon Sep 17 00:00:00 2001
++From 7d3174df83fd37b4cdcd23487cbcc5f2a7ce797b 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.
++
++Forwarded: no
 +---
 + 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

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