Added explicitly-declare-app_label.patch.

Rewritten-From: b0baf43d95f78804c6a19d436603ae22b8891310

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index e7f0172d16f90dad9412d33c9ea275dc49b5210a..a1d21c9940b942369ec180f184e0233f80a61797 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -5,6 +5,7 @@ horizon (2:8.0.0-4) unstable; urgency=medium
   * Added do-not-use-django.utils.unittest.patch.
   * Added fixed-removed-TemplateDoesNotExist.patch.
   * Added handle-django.forms.util-rename.patch.
+  * Added explicitly-declare-app_label.patch.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 11 Jan 2016 02:54:28 +0000
 

diff --git a/trusty/debian/patches/explicitly-declare-app_label.patch b/trusty/debian/patches/explicitly-declare-app_label.patch
new file mode 100644 (file)
index 0000000..6790533
--- /dev/null
+++ b/trusty/debian/patches/explicitly-declare-app_label.patch
@@ -0,0 +1,32 @@
+Description: Explicitly declares app_label
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-01-11
+
+--- horizon-8.0.0.orig/horizon/test/settings.py
++++ horizon-8.0.0/horizon/test/settings.py
+@@ -183,3 +183,6 @@ LOGGING = {
+         }
+     }
+ }
++
++app_label = 'horizon'
++APP_LABEL = 'horizon'
+--- horizon-8.0.0.orig/openstack_dashboard/local/local_settings.py.example
++++ horizon-8.0.0/openstack_dashboard/local/local_settings.py.example
+@@ -664,3 +664,6 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK
+ # For more information see:
+ # http://tinyurl.com/anticlickjack
+ #DISALLOW_IFRAME_EMBED = True
++
++app_label = 'horizon'
++APP_LABEL = 'horizon'
+--- horizon-8.0.0.orig/openstack_dashboard/test/settings.py
++++ horizon-8.0.0/openstack_dashboard/test/settings.py
+@@ -227,3 +227,6 @@ REST_API_SETTING_2 = 'bar'
+ REST_API_SECURITY = 'SECURITY'
+ REST_API_REQUIRED_SETTINGS = ['REST_API_SETTING_1']
+ REST_API_ADDITIONAL_SETTINGS = ['REST_API_SETTING_2']
++
++app_label = 'horizon'
++APP_LABEL = 'horizon'

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 5a33f3e6cbb1ed40bc4fa1ead9cbc3a1910ce725..f401dfc874a6b70727fc06dc4f71ee1c2adc7392 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -6,3 +6,4 @@ do-not-use-django.utils.log.NullHandler.patch
 do-not-use-django.utils.unittest.patch
 fixed-removed-TemplateDoesNotExist.patch
 handle-django.forms.util-rename.patch
+explicitly-declare-app_label.patch