[Python-modules-commits] [django-countries] 02/03: merge patched into master

[Thomas Goirand]

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

zigo pushed a commit to branch master
in repository django-countries.

commit 75d0384ad1ac4e85a1f76f8c15c909a7a122b47c
Merge: 192b6e5 5159adf
Author: Thomas Goirand <zigo at debian.org>
Date:   Fri Aug 5 12:41:44 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0003-Django-1.10-define-TEMPLATES.patch        | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 django_countries/tests/settings.py                 |  7 +++++++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 6715e51,0000000..b207644
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
- 6b27b41aa11a77ff1f8e02759f9342943cd5eeae
- 6b27b41aa11a77ff1f8e02759f9342943cd5eeae
++5159adf9379ce049d7c93c4b6ac09f585260cf98
++5159adf9379ce049d7c93c4b6ac09f585260cf98
 +76c43cdd93636d366f5dc293e004aca19d66d189
 +76c43cdd93636d366f5dc293e004aca19d66d189
 +django-countries_3.4.1.orig.tar.gz
 +c5aa6bdaf86dfeda55939f409a2a45101580c1d7
 +267627
diff --cc debian/patches/0003-Django-1.10-define-TEMPLATES.patch
index 0000000,0000000..f817214
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Django-1.10-define-TEMPLATES.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 5159adf9379ce049d7c93c4b6ac09f585260cf98 Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
++Date: Fri, 5 Aug 2016 12:41:18 +0000
++Subject: Django 1.10: define TEMPLATES []
++
++---
++ django_countries/tests/settings.py | 7 +++++++
++ 1 file changed, 7 insertions(+)
++
++diff --git a/django_countries/tests/settings.py b/django_countries/tests/settings.py
++index 36a15ee..1b1f856 100644
++--- a/django_countries/tests/settings.py
+++++ b/django_countries/tests/settings.py
++@@ -15,3 +15,10 @@ MIDDLEWARE_CLASSES = (
++     'django.middleware.common.CommonMiddleware',
++     'django.middleware.csrf.CsrfViewMiddleware',
++ )
+++
+++TEMPLATES = [
+++    {
+++        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+++        'APP_DIRS': True,
+++    },
+++]
diff --cc debian/patches/series
index 9970cd4,0000000..b2179e0
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +dont_include_flag_icons.patch
 +0002-Don-t-use-the-shipped-static-lists-for-the-country-c.patch
++0003-Django-1.10-define-TEMPLATES.patch

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