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

commit a2a1441a5c9d7e0eb5c158a87c7761d5ee4cf98d
Merge: f6ffd52 aef2b28
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Aug 11 22:31:04 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ngo.conf.urls.patterns-with-simple-list-f.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/urls.py                                      |  8 +++----
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 4c7ed41,0000000..ec0bbc7
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
- 293e171125f6d7bf9178c23620d8ab28696587de
- 293e171125f6d7bf9178c23620d8ab28696587de
++aef2b28aea1a9954bbb8945b1599bf5116e12d44
++aef2b28aea1a9954bbb8945b1599bf5116e12d44
 +293e171125f6d7bf9178c23620d8ab28696587de
 +293e171125f6d7bf9178c23620d8ab28696587de
 +django-celery-transactions_0.3.6.orig.tar.gz
 +a979e52579b4274fdcd919fa99111db5c9c89e58
 +10879
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Replace-django.conf.urls.patterns-with-simple-list-f.patch
index 0000000,0000000..c01ef0d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Replace-django.conf.urls.patterns-with-simple-list-f.patch
@@@ -1,0 -1,0 +1,25 @@@
++From aef2b28aea1a9954bbb8945b1599bf5116e12d44 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Thu, 11 Aug 2016 22:30:16 +0200
++Subject: Replace django.conf.urls.patterns with simple list for Django 1.10.
++
++---
++ tests/urls.py | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/tests/urls.py b/tests/urls.py
++index 1435928..9f8c2a8 100644
++--- a/tests/urls.py
+++++ b/tests/urls.py
++@@ -1,6 +1,6 @@
++-from django.conf.urls import patterns
+++from django.conf.urls import url
++ from tests.test import views
++ 
++-urlpatterns = patterns('',
++-    (r'^test_api', views.test_api)
++-)
++\ No newline at end of file
+++urlpatterns = [
+++    url(r'^test_api', views.test_api)
+++]
diff --cc debian/patches/series
index 0000000,0000000..80b6758
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Replace-django.conf.urls.patterns-with-simple-list-f.patch

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