[Python-modules-commits] [terminaltables] 06/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 0d5d27d66db630771e3b922c21078b84417652b2
Merge: 7151791 90fce8e
Author: Carl Suster <carl at contraflo.ws>
Date:   Sat Jan 7 13:05:42 2017 +1100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...0001-remove-sphinxcontrib.googleanalytics.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  4 ++--
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index f9a6b3f,0000000..99c3c2c
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
- f687517a78f1a2cda5e071df2dfd71fcbf1a1588
- f687517a78f1a2cda5e071df2dfd71fcbf1a1588
++90fce8ef39a64de4e29bb0b1bd9acb25d4831066
++90fce8ef39a64de4e29bb0b1bd9acb25d4831066
 +f687517a78f1a2cda5e071df2dfd71fcbf1a1588
 +f687517a78f1a2cda5e071df2dfd71fcbf1a1588
 +terminaltables-3.1.0.orig.tar.gz
 +4746c1d8b85e056640299ea8e1d41c8e36679824
 +278484
diff --cc debian/patches/0001-remove-sphinxcontrib.googleanalytics.patch
index 0000000,0000000..1482e98
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-remove-sphinxcontrib.googleanalytics.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 90fce8ef39a64de4e29bb0b1bd9acb25d4831066 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.
++---
++ 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/series
index 0000000,0000000..c950b2d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-remove-sphinxcontrib.googleanalytics.patch

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