Added patch: 0090-explicitly-declare-app_label.patch

Rewritten-From: 4c4f4e205d055773973cd39f4f71e2876d270aff

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index bf71d3516df523db238a069b258d1587241bcb2e..f996935f4325cecc49b4ae8788004d6fac5074c5 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -4,6 +4,7 @@ horizon (2:9.0.0~b2+2016.02.18.git.cda9604792-1) experimental; urgency=medium
   * Fixed (build-)depends for this release.
   * Added patch: Provide_2_simple_methods_to_check_for_disabled_panels.patch
   * Added patch: 0100-add-openstack_auth-in-INSTALLED_APPS.patch
+  * Added patch: 0090-explicitly-declare-app_label.patch
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 09 Dec 2015 11:37:40 +0100
 

diff --git a/trusty/debian/patches/0090-explicitly-declare-app_label.patch b/trusty/debian/patches/0090-explicitly-declare-app_label.patch
new file mode 100644 (file)
index 0000000..9d4a73f
--- /dev/null
+++ b/trusty/debian/patches/0090-explicitly-declare-app_label.patch
@@ -0,0 +1,29 @@
+Description: Explicitly declares app_label
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-02-19
+
+--- horizon-9.0.0~b2+2016.02.18.git.cda9604792.orig/horizon/test/settings.py
++++ horizon-9.0.0~b2+2016.02.18.git.cda9604792/horizon/test/settings.py
+@@ -170,3 +170,5 @@ LOGGING = {
+         }
+     }
+ }
++
++APP_LABEL = 'horizon'
+--- horizon-9.0.0~b2+2016.02.18.git.cda9604792.orig/openstack_dashboard/local/local_settings.py.example
++++ horizon-9.0.0~b2+2016.02.18.git.cda9604792/openstack_dashboard/local/local_settings.py.example
+@@ -710,3 +710,5 @@ REST_API_REQUIRED_SETTINGS = ['OPENSTACK
+ # For more information see:
+ # http://tinyurl.com/anticlickjack
+ #DISALLOW_IFRAME_EMBED = True
++
++APP_LABEL = 'horizon'
+--- horizon-9.0.0~b2+2016.02.18.git.cda9604792.orig/openstack_dashboard/test/settings.py
++++ horizon-9.0.0~b2+2016.02.18.git.cda9604792/openstack_dashboard/test/settings.py
+@@ -232,3 +232,5 @@ 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'

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index f931b8308627ee0d3726f16ee2f3530c64202686..b6e29adf6dc5a5c911f0f754743b8d303013495c 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -4,3 +4,4 @@ fixed-horizon-MANIFEST.in.patch
 #enable_identity_users_panel.patch
 Provide_2_simple_methods_to_check_for_disabled_panels.patch
 0100-add-openstack_auth-in-INSTALLED_APPS.patch
+0090-explicitly-declare-app_label.patch