Changed webroot substitution

 * modification of /usr/share/openstack-dashboard/openstack_dashboard/static/themes/webroot/_variables.scss
Related-Bug: #1478567

Change-Id: I2bb12111a61838f118a75c0c535e718e72307929

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 568a8c0a80db1312367aed132233266c9501661b..dda061ad5448181bf0c830411ca675daf0e45308 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,4 +1,4 @@
-horizon (1:2015.1.0-1~u14.04+mos6) mos7.0; urgency=medium
+horizon (1:2015.1.1-1~u14.04+mos1) mos7.0; urgency=medium
  
   * Removed python-unittest2 from build-conflicts
   * Add manage.py collectstatic

diff --git a/trusty/debian/rules b/trusty/debian/rules
index ff4becdbee2b6c0271d5bf9f6028325a977572ea..880063ec909b8b5727c96f5ed10496a3e0921fb6 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -42,9 +42,9 @@ override_dh_auto_install:
 
        # Fix path of WEBROOT to be /horizon and not just /
        sed -i "s#^WEBROOT[ \t]*=.*#WEBROOT = '/horizon'#" $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
-       # Fix path of $webroot to be /horizon and not just / for scss
-       sed -i 's#^$$webroot: ""#$$webroot: "/horizon/"#' \
-           $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss/_variables.scss
+       # Fix path of $webroot to be /horizon and not just / or /dashboard for scss
+       sed -i 's#^$$webroot: ".*"#$$webroot: "/horizon"#' \
+           $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/themes/webroot/_variables.scss
        # Fix path of secret-key (ie: in /var, as per Debian policy)
        sed -i -e 's/os.path.join(LOCAL_PATH,/os.path.join("\/","var","lib","openstack-dashboard","secret-key",/' \
                $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py