Add django-1.10-fix-wrong-django.conf.urls.url-call.patch

Rewritten-From: f2b90e4a9b48446d93b7e1a1e4bacaa52225a995

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index fff44282611d25bf2b99dfa72970d0d37600e80d..85453dab99701b28ab5e166873e86e86f5fe5a76 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -4,6 +4,7 @@ horizon (3:10.0.0~b2-2) UNRELEASED; urgency=medium
     - django-1.10-django.conf.urls.patterns-removed.patch
     - django-1.10-get_form-form_class-default-value.patch
     - django-1.10-define-TEMPLATES.patch
+    - django-1.10-fix-wrong-django.conf.urls.url-call.patch
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 20 Jul 2016 10:49:45 +0200
 

diff --git a/xenial/debian/patches/django-1.10-fix-wrong-django.conf.urls.url-call.patch b/xenial/debian/patches/django-1.10-fix-wrong-django.conf.urls.url-call.patch
new file mode 100644 (file)
index 0000000..b8a910c
--- /dev/null
+++ b/xenial/debian/patches/django-1.10-fix-wrong-django.conf.urls.url-call.patch
@@ -0,0 +1,17 @@
+Description: Fix wrong django.conf.urls.url call
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-07-20
+
+--- horizon-10.0.0~b2.orig/horizon/test/urls.py
++++ horizon-10.0.0~b2/horizon/test/urls.py
+@@ -31,8 +31,7 @@ from horizon.test.jasmine import jasmine
+ 
+ urlpatterns = [
+     url(r'', include(horizon.urls)),
+-    url(r"auth/login/", "django.contrib.auth.views.login",
+-        {'template_name': "auth/login.html"},
++    url(r"auth/login/", TemplateView.as_view(template_name="auth/login.html"),
+         name='login'),
+     url(r'auth/', include('django.contrib.auth.urls')),
+     url(r'^jasmine/.*?$', jasmine.dispatcher),

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 73d65d6f980978b217030f6430bbe4d16276d1a3..8b08b556e38f6d3d2d9b3db2bcea70ae651cf991 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -5,3 +5,4 @@ BaseCommand.option_list-is-gone-from-django1.10.patch
 django-1.10-django.conf.urls.patterns-removed.patch
 django-1.10-get_form-form_class-default-value.patch
 django-1.10-define-TEMPLATES.patch
+django-1.10-fix-wrong-django.conf.urls.url-call.patch