[Python-modules-commits] [python-django-treebeard] 13/17: 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-treebeard.

commit 544b331983e1702f8359f323f74177e4f9e4772b
Merge: e758081 ac598b9
Author: Michael Fladischer <fladi at debian.org>
Date:   Wed Dec 30 20:55:19 2015 +0100

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 ...ngodocs-extension-from-sphinx-configuratio.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 docs/conf.py                                        |  1 -
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 8399eeb,0000000..3bfd58d
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
- 25be55710dc9aac26bbeecff4a898fa00fdf1647
- 25be55710dc9aac26bbeecff4a898fa00fdf1647
++ac598b973bbd8033ad7e4f8275922c0528dc9931
++ac598b973bbd8033ad7e4f8275922c0528dc9931
 +02d1914271cd7f1807f85bfc1db0632cc5fe3133
 +02d1914271cd7f1807f85bfc1db0632cc5fe3133
 +python-django-treebeard_4.0+dfsg.orig.tar.gz
 +5b635a2406f890f4ec931bc47aa8069bfd432940
 +73678
diff --cc debian/patches/0004-Remove-djangodocs-extension-from-sphinx-configuratio.patch
index 0000000,0000000..3c9c49c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0004-Remove-djangodocs-extension-from-sphinx-configuratio.patch
@@@ -1,0 -1,0 +1,21 @@@
++From ac598b973bbd8033ad7e4f8275922c0528dc9931 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <fladi at debian.org>
++Date: Wed, 30 Dec 2015 20:54:45 +0100
++Subject: Remove djangodocs extension from sphinx configuration.
++
++---
++ docs/conf.py | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 4bed276..35aea9b 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -27,7 +27,6 @@ import django
++ django.setup()
++ 
++ extensions = [
++-    'djangodocs',
++     'sphinx.ext.autodoc',
++     'sphinx.ext.coverage',
++     'sphinx.ext.graphviz',
diff --cc debian/patches/series
index 5f2909b,0000000..4b4015d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,4 @@@
 +0001-Remove-version-infromation-from-jquery-ui-filename.patch
 +0002-Initialize-django-in-sphinx-configuration-to-prevent.patch
 +0003-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
++0004-Remove-djangodocs-extension-from-sphinx-configuratio.patch

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