[Python-modules-commits] [python-django-otp] 12/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 839a856553f68d171400f6c72149167bbd4d39a8
Merge: 429fab3 6be891f
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Mar 1 09:05:17 2017 +0100

    merge patched into master

 debian/.git-dpm                                            |  4 ++--
 ...-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch | 14 ++++++++------
 docs/source/conf.py                                        |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index e6b561d,0000000..1650178
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
- d83a8aedf41379e78a7f6d84397b5245dfac5476
- d83a8aedf41379e78a7f6d84397b5245dfac5476
++6be891feb9e8cd95b08d4a1ce4ead179719caea5
++6be891feb9e8cd95b08d4a1ce4ead179719caea5
 +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 5802170,0000000..e45f545
mode 100644,000000..100644
--- a/debian/patches/0003-Add-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch
+++ b/debian/patches/0003-Add-dependencies-to-INSTALLED_APPS-for-sphinx-autodo.patch
@@@ -1,29 -1,0 +1,31 @@@
- From d83a8aedf41379e78a7f6d84397b5245dfac5476 Mon Sep 17 00:00:00 2001
++From 6be891feb9e8cd95b08d4a1ce4ead179719caea5 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(+)
++ docs/source/conf.py | 11 ++++++++++-
++ 1 file changed, 10 insertions(+), 1 deletion(-)
 +
 +diff --git a/docs/source/conf.py b/docs/source/conf.py
- index e394cb9..4fdd923 100644
++index e394cb9..b6bdfca 100644
 +--- a/docs/source/conf.py
 ++++ b/docs/source/conf.py
- @@ -45,6 +45,15 @@ django.conf.settings.configure(
++@@ -44,7 +44,16 @@ django.conf.settings.configure(
++             'ENGINE': 'django.db.backends.sqlite3',
 +             '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()

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