[Python-modules-commits] [django-polymorphic] 11/17: merge patched-experimental into experimental

[Michael Fladischer]

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

fladi pushed a commit to branch experimental
in repository django-polymorphic.

commit 33099cb690304b9fdac0d6b894e61d5fa80db900
Merge: 6482fb7 e8bafe7
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Mar 6 12:34:46 2017 +0100

    merge patched-experimental into experimental

 debian/.git-dpm                                     |  4 ++--
 ...ango.contrib.contenttypes-in-sphinx-docume.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 docs/_ext/djangodummy/settings.py                   |  4 ++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 24b2142,0000000..34ad379
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- b03e249f8b3d9030a19704563afb2cd638325673
- b03e249f8b3d9030a19704563afb2cd638325673
++e8bafe7f766b39662718df6185e775e8790538ce
++e8bafe7f766b39662718df6185e775e8790538ce
 +9e36e07a53bb6f3d100cc5f51f162d36da9aa918
 +9e36e07a53bb6f3d100cc5f51f162d36da9aa918
 +django-polymorphic_1.1.orig.tar.gz
 +6abe4a9df5041bea9e67211f988c0b4615f9d983
 +96348
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Install-django.contrib.contenttypes-in-sphinx-docume.patch
index 0000000,0000000..e5e0c4a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Install-django.contrib.contenttypes-in-sphinx-docume.patch
@@@ -1,0 -1,0 +1,21 @@@
++From e8bafe7f766b39662718df6185e775e8790538ce Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Mon, 6 Mar 2017 12:34:10 +0100
++Subject: Install django.contrib.contenttypes in sphinx documentation settings.
++
++---
++ docs/_ext/djangodummy/settings.py | 4 ++++
++ 1 file changed, 4 insertions(+)
++
++diff --git a/docs/_ext/djangodummy/settings.py b/docs/_ext/djangodummy/settings.py
++index 414e9fa..849666a 100644
++--- a/docs/_ext/djangodummy/settings.py
+++++ b/docs/_ext/djangodummy/settings.py
++@@ -9,3 +9,7 @@ STATIC_URL = '/static/'
++ 
++ # Avoid error for missing the secret key
++ SECRET_KEY = 'docs'
+++
+++INSTALLED_APPS = [
+++    'django.contrib.contenttypes',
+++]
diff --cc debian/patches/series
index 077350e,0000000..3b17204
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-use-local-objects.inv-where-possible.patch
 +0002-Replace-force_unicode-with-force_text.patch
++0003-Install-django.contrib.contenttypes-in-sphinx-docume.patch

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