[Python-modules-commits] [python-django-otp] 08/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 3bd6b2339836133951a6bd5d6062b72bbed25130
Merge: 026a8ba 96db3cb
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Mar 1 08:38:47 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...l-django.setup-to-initialize-app-registry.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/source/conf.py                                |  2 ++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index d597774,0000000..4e71164
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
- d24462c2315b37f8ba3351308a138fd31cd50c4f
- d24462c2315b37f8ba3351308a138fd31cd50c4f
++96db3cb616fb99ec017249166a19f0cbd2f0ce02
++96db3cb616fb99ec017249166a19f0cbd2f0ce02
 +005ed8efc70304aec1ed83ead75ebe646e4528f2
 +005ed8efc70304aec1ed83ead75ebe646e4528f2
 +python-django-otp_0.3.8.orig.tar.gz
 +54393d561d85e1b9b1e90c8c3848a50206a5e1b6
 +41143
diff --cc debian/patches/0002-Call-django.setup-to-initialize-app-registry.patch
index 0000000,0000000..e965800
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Call-django.setup-to-initialize-app-registry.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 96db3cb616fb99ec017249166a19f0cbd2f0ce02 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 1 Mar 2017 08:38:17 +0100
++Subject: Call `django.setup()` to initialize app registry.
++
++---
++ docs/source/conf.py | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/docs/source/conf.py b/docs/source/conf.py
++index ec9e146..e394cb9 100644
++--- a/docs/source/conf.py
+++++ b/docs/source/conf.py
++@@ -47,6 +47,8 @@ django.conf.settings.configure(
++     }
++ )
++ 
+++django.setup()
+++
++ def check_object_path(key, url, path):
++     if os.path.isfile(path):
++         return {key: (url, path)}
diff --cc debian/patches/series
index 8831570,0000000..6be236e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Use-local-objects.inv-file-for-intersphinx.patch
++0002-Call-django.setup-to-initialize-app-registry.patch

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