From: Ivan Udovichenko Date: Thu, 13 Apr 2017 22:48:16 +0000 (+0300) Subject: [MOS 11.0][DEB] Update horizon package X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fheads%2F11.0%2Focata;p=openstack-build%2Fhorizon-build.git [MOS 11.0][DEB] Update horizon package Version: 3:11.0.0-1~u16.04+mos0 Fix (build-)dependencies. Change-Id: If53811bd68d428189bd8b316a1aca267cc5decea Related-PROD: https://mirantis.jira.com/browse/PROD-8505 --- diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 1f2596b..d7d9390 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -1,3 +1,11 @@ +horizon (3:11.0.0-1~u16.04+mos0) mos11.0; urgency=medium + + * Fix (build-)dependencies. + * d/p/mirantis: Add Make-Horizon-compatible-with-0.4.3-1- + version-of-font.patch file. + + -- Ivan Udovichenko Wed, 12 Apr 2017 19:04:28 +0300 + horizon (2:10.0.0~b2-1~u16.04+mos0) mos10.0; urgency=medium * Update to 10.0.0~b2 diff --git a/xenial/debian/control b/xenial/debian/control index 81ecac7..1fa480c 100644 --- a/xenial/debian/control +++ b/xenial/debian/control @@ -9,48 +9,48 @@ Build-Depends: debhelper (>= 9), openstack-pkg-tools, po-debconf, python-all, - python-pbr (>= 1.6), + python-pbr (>= 1.8), python-setuptools, python-sphinx (>= 1.2.1), Build-Depends-Indep: gettext, - git, python-babel (>= 2.3.4), python-ceilometerclient (>= 2.5.0), python-cinderclient (>= 1:1.6.0), python-django-compressor (>= 2.0), - python-coverage (>= 3.6), + python-coverage (>= 4.0), python-django (>= 1.8), python-django-babel (>= 0.5.1), - python-django-nose (>= 1.4.3), + python-django-nose (>= 1.4.4), python-django-openstack-auth (>= 2.4.0), python-django-pyscss (>= 2.0.2), - python-glanceclient (>= 1:2.0.0), + python-glanceclient (>= 1:2.5.0), python-hacking (>= 0.10.0), - python-heatclient (>= 1.1.0), + python-heatclient (>= 1.6.1), python-iso8601 (>= 0.1.11), - python-keystoneclient (>= 1:2.0.0), + python-keystoneclient (>= 1:3.8.0), python-mock (>= 2.0), python-mox3 (>= 0.7.0), - python-netaddr (>= 0.7.12), - python-neutronclient (>= 1:4.2.0), + python-netaddr (>= 0.7.13), + python-neutronclient (>= 1:5.1.0), python-nose, python-nose-exclude, python-nosehtmloutput (>= 0.0.3), python-nosexcover, - python-novaclient (>= 2:2.29.0), + python-novaclient (>= 2:6.0.0), python-openstack.nose-plugin, python-oslo.concurrency (>= 3.8.0), python-oslo.config (>= 1:3.14.0), python-oslo.i18n (>= 2.1.0), - python-oslo.policy (>= 1.9.0), + python-oslo.policy (>= 1.17.0), python-oslo.serialization (>= 2.0.0), - python-oslo.utils (>= 3.16.0), - python-oslosphinx (>= 2.5.0), + python-oslo.utils (>= 3.18.0), + python-oslosphinx (>= 4.7.0), python-pint (>= 0.5), python-pyscss (>= 1.3.4), + python-reno, python-selenium, python-six (>= 1.9.0), - python-swiftclient (>= 2.2.0), + python-swiftclient (>= 3.2.0), python-testtools (>= 1.4.0), python-tz (>= 2013.6), python-xstatic (>= 1.0.0), @@ -86,8 +86,6 @@ Build-Depends-Indep: gettext, python-yaml, Standards-Version: 3.9.8 Homepage: http://horizon.openstack.org -Vcs-Browser: https://anonscm.debian.org/cgit/openstack/horizon.git/ -Vcs-Git: https://anonscm.debian.org/git/openstack/horizon.git Package: python-django-horizon Section: python @@ -100,25 +98,26 @@ Depends: python-babel (>= 2.3.4), python-django-babel (>= 0.5.1), python-django-openstack-auth (>= 2.4.0), python-django-pyscss (>= 2.0.2), - python-glanceclient (>= 1:2.0.0), - python-heatclient (>= 1.1.0), + python-glanceclient (>= 1:2.5.0), + python-heatclient (>= 1.6.1), python-iso8601 (>= 0.1.11), - python-keystoneclient (>= 1:2.0.0), + python-keystoneclient (>= 1:3.8.0), python-memcache, - python-netaddr (>= 0.7.12), - python-neutronclient (>= 1:4.2.0), - python-novaclient (>= 2:2.29.0), + python-netaddr (>= 0.7.13), + python-neutronclient (>= 1:5.1.0), + python-novaclient (>= 2:6.0.0), python-oslo.concurrency (>= 3.8.0), python-oslo.config (>= 1:3.14.0), python-oslo.i18n (>= 2.1.0), - python-oslo.policy (>= 1.9.0), + python-oslo.policy (>= 1.17.0), python-oslo.serialization (>= 2.0.0), - python-oslo.utils (>= 3.16.0), + python-oslo.utils (>= 3.18.0), python-pbr (>= 1.8), python-pint (>= 0.5), + python-pymongo (>= 3.0.2), python-pyscss (>= 1.3.4), python-six (>= 1.9.0), - python-swiftclient (>= 2.2.0), + python-swiftclient (>= 3.2.0), python-tz (>= 2013.6), python-xstatic (>= 1.0.0), python-xstatic-angular (>= 1.3.7), diff --git a/xenial/debian/patches/mirantis/Make-Horizon-compatible-with-0.4.3-1-version-of-font.patch b/xenial/debian/patches/mirantis/Make-Horizon-compatible-with-0.4.3-1-version-of-font.patch new file mode 100644 index 0000000..8ce68c4 --- /dev/null +++ b/xenial/debian/patches/mirantis/Make-Horizon-compatible-with-0.4.3-1-version-of-font.patch @@ -0,0 +1,19 @@ +Description: Make it work with fonts-roboto-fontface 0.4.3-1 + Horizon is not compatible with 0.4.3-1 version of + fonts-roboto-fontface. This patch provides it. +Forwarded: not required +Author: Ivan Udovichenko +Last-Update: 2017-04-20 + +--- a/openstack_dashboard/themes/material/static/bootstrap/_styles.scss ++++ b/openstack_dashboard/themes/material/static/bootstrap/_styles.scss +@@ -3,8 +3,7 @@ + // ----------------------------------------------------- + @import "/horizon/lib/bootstrap_scss/scss/bootstrap/mixins/vendor-prefixes"; + @import "/horizon/lib/bootswatch/paper/bootswatch"; +-@import "/horizon/lib/roboto_fontface/css/roboto/sass/roboto-fontface.scss"; +- ++@import "/horizon/lib/roboto_fontface/css/roboto-fontface.scss"; + + + // Patch to Paper diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series new file mode 100644 index 0000000..8732b09 --- /dev/null +++ b/xenial/debian/patches/series @@ -0,0 +1 @@ +mirantis/Make-Horizon-compatible-with-0.4.3-1-version-of-font.patch