[MOS 9.0] Update horizon packages

Version: 2:9.0.1-2~u14.04+mos0

* Sync important changes from Debian.

Closes-Bug: #1590323

Change-Id: Ib634a519455c888523fb9ed799b798b91531ab82

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index a307a35ea1fe9826f85f084b4ceed92e6d32867c..0097227233f19a1e6e33ec98ae28d3d634e8b41f 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+horizon (2:9.0.1-2~u14.04+mos0) mos9.0; urgency=medium
+
+  * Sync important changes from Debian.
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Tue, 07 Jun 2016 14:26:23 +0300
+
 horizon (2:9.0.1-1~u14.04+mos0) mos9.0; urgency=medium
 
   * Bump up version to 9.0.1
@@ -17,6 +23,25 @@ horizon (2:9.0.0-3~u14.04+mos0) mos9.0; urgency=medium
 
  -- Ivan Udovichenko <iudovichenko@mirantis.com>  Fri, 22 Apr 2016  0:17:22 +0300
 
+horizon (2:9.0.0-3) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * d/copyright: Changed source URL to https protocol
+
+  [ Ivan Udovichenko ]
+  * d/openstack-dashboard.{preinst,postinst,postrm},
+      openstack-dashboard-apache.{preinst,postinst,postrm}:
+      - Pass the correct version to dpkg-maintscript-helper script.
+  * d/openstack-dashboard.postinst:
+      - Check if django.utils.log.NullHandler class is being used and
+        replace it with logging.NullHandler class if it is true. (Closes: #822907)
+
+  [ Thomas Goirand ]
+  * Horizon doesn't build with python-django-nose in Jessie, so increasing the
+    build-depends version to >= 1.4.3.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 31 May 2016 13:43:46 +0200
+
 horizon (2:9.0.0-2) unstable; urgency=medium
 
   [ Ondřej Nový ]

diff --git a/trusty/debian/copyright b/trusty/debian/copyright
index faa22afe896aaac75cb6c669e86d5a3ec7c041df..f4ae4c0921711135924055102b8707d42014dee7 100644 (file)
--- a/trusty/debian/copyright
+++ b/trusty/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: horizon
-Source: git://github.com/openstack/horizon.git
+Source: https://github.com/openstack/horizon
 
 Files: *
 Copyright: 2011 OpenStack LLC

diff --git a/trusty/debian/openstack-dashboard-apache.postinst b/trusty/debian/openstack-dashboard-apache.postinst
index e78f07428719e058f3515524ebe4af2cccf4c225..a34dbca0178b838ad84ab7be0ce04e3d44eacf89 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.postinst
+++ b/trusty/debian/openstack-dashboard-apache.postinst
@@ -3,7 +3,7 @@
 set -e
 
 dpkg-maintscript-helper dir_to_symlink \
-       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
+       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
 
 if [ "$1" = "configure" ] ; then
        . /usr/share/debconf/confmodule

diff --git a/trusty/debian/openstack-dashboard-apache.postrm b/trusty/debian/openstack-dashboard-apache.postrm
index aeec9fa9c7df9530c05c79185e43ff358877fd01..f53a6ee1dd800412506610ac27f62ec95fcb538e 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.postrm
+++ b/trusty/debian/openstack-dashboard-apache.postrm
@@ -3,7 +3,7 @@
 set -e
 
 dpkg-maintscript-helper dir_to_symlink \
-       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
+       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
 
 
 if [ "${1}" = "purge" ] ; then

diff --git a/trusty/debian/openstack-dashboard-apache.preinst b/trusty/debian/openstack-dashboard-apache.preinst
index 9224298fe9a4c9b940b1158738c6398a263d5ae4..c3585c86979ac427272a536f56686aa102164fe3 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.preinst
+++ b/trusty/debian/openstack-dashboard-apache.preinst
@@ -29,9 +29,9 @@ dir_to_symlink_preinst() {
 
 if [ "$1" = "install" -o "$1" = "upgrade" ] ; then
        if [ -e /usr/share/openstack-dashboard/static ] ; then
-               dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
+               dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
        fi
-       dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
+       dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
 fi
 
 #DEBHELPER#

diff --git a/trusty/debian/openstack-dashboard.postinst b/trusty/debian/openstack-dashboard.postinst
index 3c4b05ea67d8fc93d106e9118f90c34f580a81e2..7d064f5be2302e209104ad8977ecd7bda8afc630 100644 (file)
--- a/trusty/debian/openstack-dashboard.postinst
+++ b/trusty/debian/openstack-dashboard.postinst
@@ -3,7 +3,7 @@
 set -e
 
 dpkg-maintscript-helper dir_to_symlink \
-       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard -- "$@"
+       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard -- "$@"
 
 if [ "$1" = "configure" ] ; then
        adduser --system \
@@ -16,10 +16,13 @@ if [ "$1" = "configure" ] ; then
        chown www-data:www-data /var/lib/openstack-dashboard/secret-key
 
        mkdir -p /etc/openstack-dashboard
-       if ! [ -f /etc/openstack-dashboard/local_settings.py ] ; then
-               cp /usr/share/openstack-dashboard/local_settings.py /etc/openstack-dashboard/local_settings.py
+       DASHBOARD_LOCAL_SETTINGS='/etc/openstack-dashboard/local_settings.py'
+       if ! [ -f "$DASHBOARD_LOCAL_SETTINGS" ] ; then
+               cp /usr/share/openstack-dashboard/local_settings.py $DASHBOARD_LOCAL_SETTINGS
+       fi
+       if [ -f "$DASHBOARD_LOCAL_SETTINGS" ] && grep -q 'django.utils.log.NullHandler' $DASHBOARD_LOCAL_SETTINGS; then
+               sed -i 's/django.utils.log.NullHandler/logging.NullHandler/g' $DASHBOARD_LOCAL_SETTINGS
        fi
-
        if [ -L /usr/share/openstack-dashboard/static ]; then
                if ! [ $(readlink -s /usr/share/openstack-dashboard/static) = /var/lib/openstack-dashboard/static ]; then
                        ln -fs /var/lib/openstack-dashboard/static /usr/share/openstack-dashboard/static

diff --git a/trusty/debian/openstack-dashboard.postrm b/trusty/debian/openstack-dashboard.postrm
index eb967542a0b2289432c7266d01efd3bd601205d5..f80555c38c3ebcc4129bb10f719a346733d7fd10 100644 (file)
--- a/trusty/debian/openstack-dashboard.postrm
+++ b/trusty/debian/openstack-dashboard.postrm
@@ -3,7 +3,7 @@
 set -e
 
 dpkg-maintscript-helper dir_to_symlink \
-       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard -- "$@"
+       /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard -- "$@"
 
 if [ "${1}" = "purge" ] ; then
        rm -f /etc/openstack-dashboard/local_settings.py

diff --git a/trusty/debian/openstack-dashboard.preinst b/trusty/debian/openstack-dashboard.preinst
index 3916bba8adaa9cf63416869992f8dcf90bfe4748..c1bd0e116dbe37fe07c333b09a99d4dff6f9cd48 100644 (file)
--- a/trusty/debian/openstack-dashboard.preinst
+++ b/trusty/debian/openstack-dashboard.preinst
@@ -29,9 +29,9 @@ dir_to_symlink_preinst() {
 
 if [ "$1" = "install" -o "$1" = "upgrade" ] ; then
        if [ -e /usr/share/openstack-dashboard/static ] ; then
-               dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard -- "$@"
+               dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard -- "$@"
        fi
-       dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard -- "$@"
+       dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 2:9.0.0~rc1-2 openstack-dashboard -- "$@"
 fi
 
 #DEBHELPER#