[Python-modules-commits] [python-django-etcd-settings] 07/14: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository python-django-etcd-settings.

commit a822b6d007e25858b6eb19de5e2e0ace17d5785f
Merge: 47b4cb8 4eef2d2
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Dec 14 09:52:45 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...Use-packaged-plantuml.jar-file-for-sphinx.patch | 22 ++++++++++++++++++++++
 .../0003-Use-packaged-MathJax.js-for-sphinx.patch  | 22 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 docs/conf.py                                       |  4 +++-
 5 files changed, 51 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index a918f65,0000000..be8e067
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
- 06f9af2d293e0ef3774c3e99983f951a548a1ee7
- 06f9af2d293e0ef3774c3e99983f951a548a1ee7
++4eef2d2b78fa51a284f43aa2145425ba8636e4d3
++4eef2d2b78fa51a284f43aa2145425ba8636e4d3
 +8f621f963901bc060b322d52b9033ba29d618fae
 +8f621f963901bc060b322d52b9033ba29d618fae
 +python-django-etcd-settings_0.1.11+dfsg.orig.tar.gz
 +7417d0c665a0d29025de15da71ab2b723cc109bc
 +21439
diff --cc debian/patches/0002-Use-packaged-plantuml.jar-file-for-sphinx.patch
index 0000000,0000000..9631fff
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Use-packaged-plantuml.jar-file-for-sphinx.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 509025b5649f660c7427ad122c05c5e9ebd3523f Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 14 Dec 2016 09:50:12 +0100
++Subject: Use packaged plantuml.jar file for sphinx.
++
++---
++ docs/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 84610cf..da32dc6 100755
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -40,7 +40,7 @@ extensions = [
++     'sphinxcontrib.plantuml',
++ ]
++ 
++-plantuml_jar_path = os.path.abspath('./_plantuml/plantuml.jar')
+++plantuml_jar_path = '/usr/share/plantuml/plantuml.jar'
++ plantuml = 'java -Djava.awt.headless=true -jar {0}'.format(plantuml_jar_path)
++ 
++ # Add any paths that contain templates here, relative to this directory.
diff --cc debian/patches/0003-Use-packaged-MathJax.js-for-sphinx.patch
index 0000000,0000000..f5afe1b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Use-packaged-MathJax.js-for-sphinx.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 4eef2d2b78fa51a284f43aa2145425ba8636e4d3 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 14 Dec 2016 09:52:21 +0100
++Subject: Use packaged MathJax.js for sphinx.
++
++---
++ docs/conf.py | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index da32dc6..df0fd8e 100755
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -43,6 +43,8 @@ extensions = [
++ plantuml_jar_path = '/usr/share/plantuml/plantuml.jar'
++ plantuml = 'java -Djava.awt.headless=true -jar {0}'.format(plantuml_jar_path)
++ 
+++mathjax_path = '/usr/share/javascript/mathjax/MathJax.js'
+++
++ # Add any paths that contain templates here, relative to this directory.
++ templates_path = ['_templates']
++ 
diff --cc debian/patches/series
index 61d1e68,0000000..8df5dc1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,3 @@@
 +0001-Add-setup-file-to-avoid-yet-another-Build-Depends-on.patch
++0002-Use-packaged-plantuml.jar-file-for-sphinx.patch
++0003-Use-packaged-MathJax.js-for-sphinx.patch

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