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

commit 429fab3d69c8957524d3bf65a110be3aa12fcc0e
Merge: 3bd6b23 d83a8ae
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Mar 1 09:00:20 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...ncies-to-INSTALLED_APPS-for-sphinx-autodo.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/source/conf.py                                |  9 +++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 4e71164,0000000..e6b561d
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
- 96db3cb616fb99ec017249166a19f0cbd2f0ce02
- 96db3cb616fb99ec017249166a19f0cbd2f0ce02
++d83a8aedf41379e78a7f6d84397b5245dfac5476
++d83a8aedf41379e78a7f6d84397b5245dfac5476
 +005ed8efc70304aec1ed83ead75ebe646e4528f2
 +005ed8efc70304aec1ed83ead75ebe646e4528f2
 +python-django-otp_0.3.8.orig.tar.gz
 +54393d561d85e1b9b1e90c8c3848a50206a5e1b6
 +41143
diff --cc debian/patches/0003-Add-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch
index 0000000,0000000..5802170
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Add-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch
@@@ -1,0 -1,0 +1,29 @@@
++From d83a8aedf41379e78a7f6d84397b5245dfac5476 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 1 Mar 2017 08:59:24 +0100
++Subject: Add dependencies to INSTALLED_APPS for sphinx autodoc.
++
++---
++ docs/source/conf.py | 9 +++++++++
++ 1 file changed, 9 insertions(+)
++
++diff --git a/docs/source/conf.py b/docs/source/conf.py
++index e394cb9..4fdd923 100644
++--- a/docs/source/conf.py
+++++ b/docs/source/conf.py
++@@ -45,6 +45,15 @@ django.conf.settings.configure(
++             'NAME': '/tmp/django_otp.sqlite',
++         }
++     }
+++    INSTALLED_APPS=[
+++        'django.contrib.auth',
+++        'django.contrib.contenttypes',
+++        'django_otp',
+++        'django_otp.plugins.otp_email',
+++        'django_otp.plugins.otp_static',
+++        'django_otp.plugins.otp_totp',
+++        'django_otp.plugins.otp_hotp',
+++    ]
++ )
++ 
++ django.setup()
diff --cc debian/patches/series
index 6be236e,0000000..93ca8c5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Use-local-objects.inv-file-for-intersphinx.patch
 +0002-Call-django.setup-to-initialize-app-registry.patch
++0003-Add-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch

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