[Python-modules-commits] [django-classy-tags] 02/06: 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-classy-tags.

commit 6454e7ee809bc1c28da22e820abaced62094cab5
Merge: a646a1f 8cfa8e2
Author: Thomas Goirand <zigo at debian.org>
Date:   Tue Aug 2 10:04:03 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0002-django-1.10-define_TEMPLATES.patch        | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 runtests.py                                        | 14 ++++++++
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index a869867,0000000..af6ed02
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
- 4886b09c8243f745ba9768f7993ee9b7880eb096
- 4886b09c8243f745ba9768f7993ee9b7880eb096
++8cfa8e21ecea7c92673c01c1a0a3d995d37a88e3
++8cfa8e21ecea7c92673c01c1a0a3d995d37a88e3
 +e48f21fa6306e61da1654f9e2d6914fc11146bc5
 +e48f21fa6306e61da1654f9e2d6914fc11146bc5
 +django-classy-tags_0.7.2.orig.tar.gz
 +49483edbc12b76d34d7f8fd922743e4df245a949
 +36154
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-django-1.10-define_TEMPLATES.patch
index 0000000,0000000..d41755c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-django-1.10-define_TEMPLATES.patch
@@@ -1,0 -1,0 +1,41 @@@
++From 8cfa8e21ecea7c92673c01c1a0a3d995d37a88e3 Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
++Date: Tue, 2 Aug 2016 10:03:34 +0000
++Subject: django-1.10-define_TEMPLATES
++
++---
++ runtests.py | 14 ++++++++++++++
++ 1 file changed, 14 insertions(+)
++
++diff --git a/runtests.py b/runtests.py
++index 9d80309..0d054ad 100644
++--- a/runtests.py
+++++ b/runtests.py
++@@ -32,6 +32,19 @@ else:
++ 
++ ROOT_URLCONF = 'runtests'
++ 
+++TEMPLATES = [
+++    {
+++        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+++        'APP_DIRS': True,
+++        'DIRS': [
+++            os.path.join(os.path.dirname(__file__), 'test_templates'),
+++        ],
+++        'OPTIONS': {
+++            'debug': True,
+++        },
+++    },
+++]
+++
++ def main():
++     import django
++     from django.conf import settings
++@@ -43,6 +56,7 @@ def main():
++         TEMPLATE_DIRS = TEMPLATE_DIRS,
++         TEMPLATE_DEBUG = TEMPLATE_DEBUG,
++         MIDDLEWARE_CLASSES = [],
+++        TEMPLATES=TEMPLATES,
++     )
++ 
++     # Run the test suite, including the extra validation tests.
diff --cc debian/patches/series
index a695c8d,0000000..5b8cb91
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +intersphinx.patch
++0002-django-1.10-define_TEMPLATES.patch

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