[Python-modules-commits] [python-django-navtag] 02/04: 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-navtag.

commit 7b267a15b3f9ad0240329982700b542940068ca9
Merge: f33d8b0 29ccc1e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Aug 19 20:43:48 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ES-setting-to-tests-for-Django-1.10-compa.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 django_navtag/test_settings.py                     |  7 ++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index f42ea3d,0000000..9c11a98
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
- d719686ed643d8d1a8c58df7cc6f611b642b87d5
- d719686ed643d8d1a8c58df7cc6f611b642b87d5
++29ccc1e545c6dea5b8ed2898233dbde9bef4a6e8
++29ccc1e545c6dea5b8ed2898233dbde9bef4a6e8
 +d719686ed643d8d1a8c58df7cc6f611b642b87d5
 +d719686ed643d8d1a8c58df7cc6f611b642b87d5
 +python-django-navtag_2.1.1.orig.tar.gz
 +66f72faa810f466533938eeb72373b40ce80fb87
 +6966
diff --cc debian/patches/0001-Add-TEMPLATES-setting-to-tests-for-Django-1.10-compa.patch
index 0000000,0000000..e4ab5d8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-TEMPLATES-setting-to-tests-for-Django-1.10-compa.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 29ccc1e545c6dea5b8ed2898233dbde9bef4a6e8 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 19 Aug 2016 20:42:58 +0200
++Subject: Add TEMPLATES setting to tests for Django 1.10 compatibility (Closes:
++ #834470).
++
++---
++ django_navtag/test_settings.py | 7 +++++++
++ 1 file changed, 7 insertions(+)
++
++diff --git a/django_navtag/test_settings.py b/django_navtag/test_settings.py
++index ffb7762..122af2c 100644
++--- a/django_navtag/test_settings.py
+++++ b/django_navtag/test_settings.py
++@@ -12,3 +12,10 @@ INSTALLED_APPS = [
++ ]
++ 
++ SECRET_KEY = 'testing'
+++
+++TEMPLATES = [
+++    {
+++        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+++        'APP_DIRS': True,
+++    },
+++]
diff --cc debian/patches/series
index 0000000,0000000..1904340
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-TEMPLATES-setting-to-tests-for-Django-1.10-compa.patch

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