Update of "ubuntu_settings.patch" patch,

update of deb spec.

Change-Id: Iae67a51dde3ba831a29b17f127ab91e78cb472df

diff --git a/debian/control b/debian/control
index 20bc0f03b0bdc0bd38e4fd38227a03531718db3e..c21c50c111fe50e6c49d7523d19b6dab77c70668 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Depends:
  python-cinderclient (>= 1.0.7),
  python-cloudfiles,
  python-compressor (>= 1.4),
+ python-oslo.concurrency (>= 1.4.1),
  python-django (>= 1.4.2), python-django (<< 1.7),
  python-django-pyscss (>= 1.0.3),
  python-eventlet (>= 0.15.1),
@@ -45,11 +46,13 @@ Depends:
  python-openstack-auth (>= 1.1.7),
  python-oslo.serialization (>= 1.0.0),
  python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0),
+ python-pint (>= 0.5),
  python-saharaclient (>= 0.7.3),
  python-six (>= 1.7.0),
  python-swiftclient (>= 2.2.0),
  python-troveclient (>= 1.0.4),
  python-tz,
+ python-xstatic-angular-bootstrap (>= 0.11.0.2),
  python-xstatic-angular-cookies (>= 1.2.1.1),
  python-xstatic-angular-mock (>= 1.2.1.1),
  python-xstatic-angular (>= 1.2.1.1),
@@ -67,7 +70,9 @@ Depends:
  python-xstatic-jsencrypt (>= 2.0.0.2),
  python-xstatic-qunit (>= 1.14.0.2),
  python-xstatic-rickshaw (>= 1.5.0),
+ python-xstatic-smart-table (>= 1.4.5.3),
  python-xstatic-spin (>= 1.2.5.2),
+ python-xstatic-term.js (>= 0.0.4),
  python-xstatic (>= 1.0.0),
  ${misc:Depends},
  ${python:Depends}
@@ -110,4 +115,4 @@ Depends:
  ${python:Depends}
 Description: Ubuntu theme for the Openstack dashboard
  A custom Ubuntu theme for Horizon.  This package is optional and overrides the
- default theme and branding.
+ default theme and branding.
\ No newline at end of file

diff --git a/debian/patches/ubuntu_settings.patch b/debian/patches/ubuntu_settings.patch
index f7881d04cb1d462076b26e7e30668679361357b2..7095f4ad5a9e77c1cda591ffdda75d9d2c3f3814 100644 (file)
--- a/debian/patches/ubuntu_settings.patch
+++ b/debian/patches/ubuntu_settings.patch
@@ -50,5 +50,5 @@ diff -Naurp horizon-2014.2.b2.orig/openstack_dashboard/settings.py horizon-2014.
 -                                                       '.secret_key_store'))
 +    SECRET_KEY = secret_key.generate_or_read_from_file('/var/lib/openstack-dashboard/secret_key')
  
- from openstack_dashboard import policy
- POLICY_CHECK_FUNCTION = policy.check
+ from openstack_dashboard import policy_backend
+ POLICY_CHECK_FUNCTION = policy_backend.check