* Add Django 1.10 patch:

    - django-1.10-django.conf.urls.patterns-removed.patch

Rewritten-From: c87cbaaba6e1f83bf2bebdfbf75ce8c7aab2c479

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index da30f59432ddc0dc77ea18002eae0b61c03a29fb..be35a6c56971e7d7bf99ea5ef392d718283315fc 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,10 @@
+horizon (3:10.0.0~b2-2) UNRELEASED; urgency=medium
+
+  * Add Django 1.10 patch:
+    - django-1.10-django.conf.urls.patterns-removed.patch
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 20 Jul 2016 10:49:45 +0200
+
 horizon (3:10.0.0~b2-1) experimental; urgency=medium
 
   * New upstream release.

diff --git a/xenial/debian/patches/django-1.10-django.conf.urls.patterns-removed.patch b/xenial/debian/patches/django-1.10-django.conf.urls.patterns-removed.patch
new file mode 100644 (file)
index 0000000..df35358
--- /dev/null
+++ b/xenial/debian/patches/django-1.10-django.conf.urls.patterns-removed.patch
@@ -0,0 +1,34 @@
+Description: [Django 1.10] django.conf.urls.patterns() removed
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-07-20
+
+--- horizon-10.0.0~b2.orig/openstack_dashboard/dashboards/project/ngdetails/urls.py
++++ horizon-10.0.0~b2/openstack_dashboard/dashboards/project/ngdetails/urls.py
+@@ -18,7 +18,6 @@ from django.conf.urls import url
+ from openstack_dashboard.dashboards.project.ngdetails import views
+ 
+ 
+-urlpatterns = patterns(
+-    'openstack_dashboard.dashboards.project.ngdetails.views',
++urlpatterns = [
+     url('', views.IndexView.as_view(), name='index'),
+-)
++]
+--- horizon-10.0.0~b2.orig/openstack_dashboard/dashboards/project/volumes/cg_snapshots/urls.py
++++ horizon-10.0.0~b2/openstack_dashboard/dashboards/project/volumes/cg_snapshots/urls.py
+@@ -15,12 +15,11 @@ from django.conf.urls import url
+ 
+ from openstack_dashboard.dashboards.project.volumes.cg_snapshots import views
+ 
+-urlpatterns = patterns(
+-    '',
++urlpatterns = [
+     url(r'^(?P<cg_snapshot_id>[^/]+)/cg_snapshot_detail/$',
+         views.DetailView.as_view(),
+         name='cg_snapshot_detail'),
+     url(r'^(?P<cg_snapshot_id>[^/]+)/create_cgroup/$',
+         views.CreateCGroupView.as_view(),
+         name='create_cgroup'),
+-)
++]

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 75ce97623e52dcac62df40a8cb87b4a2765fdb30..a78e9b58ecd3ced2a7257e6d4a0def7eceeba6b9 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -2,3 +2,4 @@ fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
 BaseCommand.option_list-is-gone-from-django1.10.patch
+django-1.10-django.conf.urls.patterns-removed.patch