Removed Improving_find_static_robustness.patch

Rewritten-From: 4b951db14de46a31126ec498ffb519fa2e8a70bf

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 6c6d1e6f8e529b6668b629a5c5dfc7850a20fae7..f82bf8f277904b4801b5e062fe8c88c76f08bdba 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,11 @@
+horizon (2:8.0.0~rc1-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Removed Improving_find_static_robustness.patch applied upstream.
+
+ -- Thomas Goirand <zigo@debian.org>  Sat, 26 Sep 2015 16:05:12 +0200
+
 horizon (2:8.0.0~b3-7) experimental; urgency=medium
 
   * openstack-dashboard-apache now also Depends: apache2.

diff --git a/trusty/debian/patches/Improving_find_static_robustness.patch b/trusty/debian/patches/Improving_find_static_robustness.patch
deleted file mode 100644 (file)
index e185adf..0000000
--- a/trusty/debian/patches/Improving_find_static_robustness.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: eric <eric.peterson1@twcable.com>
-Date: Wed, 16 Sep 2015 22:19:07 +0000 (-0600)
-Subject: Improving find  static robustness
-X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fhorizon.git;a=commitdiff_plain;h=515374d43148864fbdb27f9e26dac6679c0d93ed
-
-Improving find  static robustness
-
-The find static utility method assumes a filesystem layout
-that may or may not be present on certain distros.  This fixes
-this by using the python install path.
-
-Closes-bug: #1494171
-
-Change-Id: Iab72b4b872849d2496cc634677e5bfe478aa03be
----
-
-diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 1a05135..249e53a 100644
---- a/openstack_dashboard/settings.py
-+++ b/openstack_dashboard/settings.py
-@@ -325,7 +325,7 @@ if os.path.exists(os.path.join(CUSTOM_THEME, 'img')):
- 
- # populate HORIZON_CONFIG with auto-discovered JavaScript sources, mock files,
- # specs files and external templates.
--find_static_files(ROOT_PATH, HORIZON_CONFIG)
-+find_static_files(HORIZON_CONFIG)
- 
- # Load the pluggable dashboard settings
- import openstack_dashboard.enabled
-diff --git a/openstack_dashboard/static_settings.py b/openstack_dashboard/static_settings.py
-index 4f0c4d3..1703680 100644
---- a/openstack_dashboard/static_settings.py
-+++ b/openstack_dashboard/static_settings.py
-@@ -139,12 +139,17 @@ def get_staticfiles_dirs(webroot='/'):
-     return STATICFILES_DIRS
- 
- 
--def find_static_files(ROOT_PATH, HORIZON_CONFIG):
-+def find_static_files(HORIZON_CONFIG):
-+    import horizon
-+    import openstack_dashboard
-+    os_dashboard_home_dir = openstack_dashboard.__path__[0]
-+    horizon_home_dir = horizon.__path__[0]
-+
-     # note the path must end in a '/' or the resultant file paths will have a
-     # leading "/"
-     file_discovery.populate_horizon_config(
-         HORIZON_CONFIG,
--        os.path.join(ROOT_PATH, '..', 'horizon', 'static/')
-+        os.path.join(horizon_home_dir, 'static/')
-     )
- 
-     # filter out non-angular javascript code and lib
-@@ -155,6 +160,6 @@ def find_static_files(ROOT_PATH, HORIZON_CONFIG):
-     # leading "/"
-     file_discovery.populate_horizon_config(
-         HORIZON_CONFIG,
--        os.path.join(ROOT_PATH, 'static/'),
-+        os.path.join(os_dashboard_home_dir, 'static/'),
-         sub_path='app/'
-     )
-diff --git a/openstack_dashboard/test/settings.py b/openstack_dashboard/test/settings.py
-index 1826f74..1926644 100644
---- a/openstack_dashboard/test/settings.py
-+++ b/openstack_dashboard/test/settings.py
-@@ -87,7 +87,7 @@ settings.update_dashboards(
- )
- INSTALLED_APPS[0:0] = []
- 
--find_static_files(ROOT_PATH, HORIZON_CONFIG)
-+find_static_files(HORIZON_CONFIG)
- 
- # Set to True to allow users to upload images to glance via Horizon server.
- # When enabled, a file form field will appear on the create image form.

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 5350af5c8cf160d1d306d8b5ec79b30d2fe2bc60..89e6f35a4069cfbeda41ba9e693b36ab17a878d7 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,4 +1,2 @@
 fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
-fixed-horizon-MANIFEST.in.patch
-Improving_find_static_robustness.patch