[Python-modules-commits] [django-celery] 02/05: 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-celery.

commit a8100081779343779292f5f1446b412a84e3aeaa
Merge: 3d384e2 b567592
Author: Thomas Goirand <zigo at debian.org>
Date:   Tue Aug 2 22:22:53 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0008-django-1.10-fix-import-error.patch        | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/urls.py                                      |  7 +------
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 7c58823,0000000..9225bdf
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
- b1488a7aaa79825d44219d52c104011bc100d81f
- b1488a7aaa79825d44219d52c104011bc100d81f
++b5675921b1452d1da6091d0a47d1c369dd72946e
++b5675921b1452d1da6091d0a47d1c369dd72946e
 +58751dd4216a267ccad1f8b5932487c51af036e4
 +58751dd4216a267ccad1f8b5932487c51af036e4
 +django-celery_3.1.17.orig.tar.gz
 +64ca723de395f66decb5563e037c094ed723e45b
 +79615
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0008-django-1.10-fix-import-error.patch
index 0000000,0000000..6d65136
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-django-1.10-fix-import-error.patch
@@@ -1,0 -1,0 +1,24 @@@
++From b5675921b1452d1da6091d0a47d1c369dd72946e Mon Sep 17 00:00:00 2001
++From: Thomas Goirand <zigo at debian.org>
++Date: Tue, 2 Aug 2016 22:22:25 +0000
++Subject: django-1.10 fix import error
++
++---
++ tests/urls.py | 7 +------
++ 1 file changed, 1 insertion(+), 6 deletions(-)
++
++diff --git a/tests/urls.py b/tests/urls.py
++index 9d72f70..a236dea 100644
++--- a/tests/urls.py
+++++ b/tests/urls.py
++@@ -1,9 +1,4 @@
++-try:
++-    from django.conf.urls import (patterns, include, url,
++-                                  handler500, handler404)
++-except ImportError:
++-    from django.conf.urls.defaults import (patterns, include, url,  # noqa
++-                                  handler500, handler404)
+++from django.conf.urls import (patterns, include, url, handler500, handler404)
++ from djcelery.views import apply
++ 
++ # Uncomment the next two lines to enable the admin:
diff --cc debian/patches/series
index 4d5a1d4,0000000..1805940
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,8 @@@
 +fix_dependencies.patch
 +no-issues.patch
 +fix_autodiscover.patch
 +privacy.patch
 +0005-Fix-python3-issues.patch
 +0006-Fix-caching-with-Django-1.9.patch
 +0007-Fix-get_model-with-Django-1.9.patch
++0008-django-1.10-fix-import-error.patch

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