]> review.fuel-infra Code Review - openstack-build/horizon-build.git/commitdiff
[MOS 9.0] Update horizon package 66/19966/2
authorIvan Udovichenko <iudovichenko@mirantis.com>
Thu, 21 Apr 2016 22:44:48 +0000 (01:44 +0300)
committerIvan Udovichenko <iudovichenko@mirantis.com>
Fri, 22 Apr 2016 11:41:41 +0000 (14:41 +0300)
Version: 2:9.0.0-2~u14.04+mos0
Source: https://anonscm.debian.org/git/openstack/horizon.git
Commit: 57ebe3655c928657735981c155a078dcb59c005b

* Fix (build-)dependencies.

Change-Id: Ie97571799d5da8d715afece561773512574a6560

17 files changed:
trusty/debian/apache-sites-available/openstack-dashboard-alias-only.conf
trusty/debian/apache-sites-available/openstack-dashboard-ssl.conf
trusty/debian/apache-sites-available/openstack-dashboard.conf
trusty/debian/changelog
trusty/debian/control
trusty/debian/copyright
trusty/debian/openstack-dashboard-apache.install
trusty/debian/openstack-dashboard-apache.postinst
trusty/debian/openstack-dashboard-apache.postrm
trusty/debian/openstack-dashboard-apache.preinst [new file with mode: 0644]
trusty/debian/openstack-dashboard.postinst
trusty/debian/openstack-dashboard.postrm
trusty/debian/openstack-dashboard.preinst [new file with mode: 0644]
trusty/debian/openstack-dashboard.triggers
trusty/debian/po/ja.po
trusty/debian/po/nl.po
trusty/debian/po/pt_BR.po [new file with mode: 0644]

index 0f095b27b6f05276c11ac7705fc01f503e504ae1..942fff9a3d155eb92b6730179e840d8c988e45f1 100644 (file)
@@ -1,5 +1,5 @@
 WSGIScriptAlias /horizon /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-WSGIDaemonProcess horizon user=horizon group=horizon
+WSGIDaemonProcess horizon user=www-data group=www-data
 Alias /static /var/lib/openstack-dashboard/static
 Alias /horizon/static /var/lib/openstack-dashboard/static
 
index 6ce9f4407b027849cfa2f46c88b398ed53998d0d..6b189b40dc57c50c3a149ed82c124f2248d18b31 100644 (file)
@@ -9,7 +9,7 @@
     BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 
     WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-    WSGIDaemonProcess horizon user=horizon group=horizon
+    WSGIDaemonProcess horizon user=www-data group=www-data
     #WSGIProcessGroup openstack-dashboard
     Alias /static /var/lib/openstack-dashboard/static
     Alias /horizon/static /var/lib/openstack-dashboard/static
index b841718b787504142772a9ee8054921d91469e53..634fd597d342207db11498c52e326f4a02723f8d 100644 (file)
@@ -1,7 +1,7 @@
 <VirtualHost *:80>
     ServerAdmin webmaster@localhost
     WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-    WSGIDaemonProcess horizon user=horizon group=horizon
+    WSGIDaemonProcess horizon user=www-data group=www-data
     #WSGIProcessGroup openstack-dashboard
     Alias /static /var/lib/openstack-dashboard/static
     Alias /horizon/static /var/lib/openstack-dashboard/static
index 826cc5400e3bd03933f0b092c1ce42248da04ede..c08587a5568f359add33d00bdcaccc43a829ebab 100644 (file)
@@ -1,3 +1,69 @@
+horizon (2:9.0.0-3~u14.04+mos0) mos9.0; urgency=medium
+
+  * Source: https://anonscm.debian.org/git/openstack/horizon.git
+    Commit: 57ebe3655c928657735981c155a078dcb59c005b
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Fri, 22 Apr 2016  0:17:22 +0300
+
+horizon (2:9.0.0-2) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Standards-Version is 3.9.8 now (no change)
+
+  [ Ivan Udovichenko ]
+  * d/openstack-dashboard-apache.postinst: Revert changes. (Closes: #820845)
+    - Do not modify provided Apache configuration files.
+    - Enable site provided by openstack-dashboard-alias-only.conf .
+  * d/openstack-dashboard.triggers: Trigger package configuration
+                                    only once. (Closes: #821868)
+  * d/control: Fix documentation build by adding git to build-dependencies.
+  * Add myself to Uploaders field.
+  * Uploading to unstable.
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Wed, 13 Apr 2016 23:34:27 +0300
+
+horizon (2:9.0.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 07 Apr 2016 21:18:30 +0200
+
+horizon (2:9.0.0~rc2-1) unstable; urgency=medium
+
+  [ Thomas Goirand ]
+  * New upstream release.
+  * Uploading to unstable (Closes: #809575).
+  * Also copy openstack_dashboard/dashboards/project/static/dashboard/project
+    which were not packaged.
+  * Updated nl.po debconf translation (Closes: #805465).
+  * Updated ja.po debconf translation (Closes: #816070).
+  * Added pt_BR.po debconf translation (Closes: #816942).
+  * Removed unused license in debian/copyright.
+
+  [ Ivan Udovichenko ]
+  * d/control: Add python-xstatic-magic-search dependency.
+               Move memcached and openstack-dashboard-apache to Suggests field.
+  * d/openstack-dashboard-apache.postinst:
+      - Delete the .secret_ket_store file if exists.
+      - Make www-data the owner of /var/lib/openstack-dashboard/secret-key and
+        /var/lib/openstack-dashboard/static directories.
+      - Set new alias to Horizon static files.
+      - Call collectstatic with --clear and --noinput options.
+  * d/openstack-dashboard.{preinst,postinst,postrm},
+      openstack-dashboard-apache.{preinst,postinst,postrm}:
+      - Remove /usr/share/openstack-dashboard/static directory and create a
+        link to /var/lib/openstack-dashboard/static directory to make it
+        compatible with Ubuntu OpenStack Puppet manifests.
+  * d/rules: Do not copy/create additional files/links with/to static files.
+  * d/openstack-dashboard.links: Remove all links except a link to
+    /usr/bin/lessc binary.
+  * d/debian/apache-sites-available/*.conf:
+      - Change/add alias path to static files.
+      - Update permissions according to Apache 2.4 improvements.
+      - Change user/group to www-data .
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Wed, 30 Mar 2016 22:23:48 +0300
+
 horizon (2:9.0.0~rc1-2~u14.04+mos1) mos9.0; urgency=medium
 
   * Add horizon-vendor-theme to recommends of openstack-dashboard
@@ -12,6 +78,21 @@ horizon (2:9.0.0~rc1-1~u14.04+mos1) mos9.0; urgency=medium
 
  -- Daniil Trishkin <dtrishkin@mirantis.com>  Fri, 18 Mar 2016 20:32:48 +0300
 
+horizon (2:9.0.0~rc1-1) experimental; urgency=medium
+
+  [ Ondřej Nový ]
+  * Fixed VCS URLs (https).
+
+  [ Thomas Goirand ]
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Added python-selenium as build-depends, to satisfy the imports.
+  * Fixed debian/copyright.
+  * Added patch: Fix_remaining_Django_1.9_test_failures.patch
+  * Standards-Version: 3.9.7 (no change).
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 04 Mar 2016 16:56:53 +0800
+
 horizon (2:9.0.0~b2-2~u14.04+mos1) mos9.0; urgency=medium
 
   * d/openstack-dashboard-apache.postinst: Disable all non-default sites in
index 4c95de20599f727155d4630ee5198fd43df0bb9a..0e445137438bd1b659f11656c8a3bef8101dc80c 100644 (file)
@@ -3,30 +3,32 @@ Section: net
 Priority: extra
 Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
 Uploaders: Thomas Goirand <zigo@debian.org>,
+           Ivan Udovichenko <iudovichenko@mirantis.com>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                openstack-pkg-tools,
                po-debconf,
                python-all,
                python-pbr (>= 1.6),
-               python-setuptools,
-               python-sphinx,
+               python-setuptools (>= 16.0),
+               python-sphinx (>= 1.1.2),
 Build-Depends-Indep: gettext,
-                     python-babel,
-                     python-ceilometerclient (>= 2.0.0),
-                     python-cinderclient (>= 1:1.3.0),
-                     python-compressor,
-                     python-coverage,
+                     git,
+                     python-babel (>= 1.3),
+                     python-ceilometerclient (>= 2.2.1),
+                     python-cinderclient (>= 1:1.3.1),
+                     python-django-compressor (>= 2.0),
+                     python-coverage (>= 3.6),
                      python-django (>= 1.8),
-                     python-django-babel,
-                     python-django-nose,
+                     python-django-babel (>= 0.4.0),
+                     python-django-nose (>= 1.2),
                      python-django-openstack-auth (>= 2.0.0),
                      python-django-pyscss (>= 2.0.2),
-                     python-glanceclient (>= 1:1.2.0),
-                     python-hacking,
+                     python-glanceclient (>= 1:2.0.0),
+                     python-hacking (>= 0.10.2),
                      python-heatclient (>= 0.6.0),
-                     python-httplib2,
-                     python-iso8601,
+                     python-httplib2 (>= 0.7.5),
+                     python-iso8601 (>= 0.1.9),
                      python-keystoneclient (>= 1:1.6.0),
                      python-mock (>= 1.3),
                      python-mox3 (>= 0.7.0),
@@ -34,54 +36,55 @@ Build-Depends-Indep: gettext,
                      python-neutronclient (>= 1:2.6.0),
                      python-nose,
                      python-nose-exclude,
-                     python-nosehtmloutput,
+                     python-nosehtmloutput (>= 0.0.3),
                      python-nosexcover,
                      python-novaclient (>= 2:2.29.0),
-                     python-openstack.nose-plugin,
-                     python-oslo.concurrency (>= 2.3.0),
-                     python-oslo.config (>= 1:3.2.0),
-                     python-oslo.i18n (>= 1.5.0),
+                     python-openstack.nose-plugin (>= 0.7),
+                     python-oslo.concurrency (>= 3.5.0),
+                     python-oslo.config (>= 1:3.7.0),
+                     python-oslo.i18n (>= 2.1.0),
                      python-oslo.policy (>= 0.5.0),
                      python-oslo.serialization (>= 2.0.0),
-                     python-oslo.utils (>= 3.2.0),
+                     python-oslo.utils (>= 3.5.0),
                      python-oslosphinx (>= 2.5.0),
-                     python-pint,
+                     python-pint (>= 0.5),
                      python-pyscss (>= 1.3.4),
+                     python-selenium,
                      python-six (>= 1.9.0),
-                     python-swiftclient,
+                     python-swiftclient (>= 2.2.0),
                      python-testtools (>= 1.4.0),
-                     python-tz,
-                     python-xstatic,
+                     python-tz (>= 2013.6),
+                     python-xstatic (>= 1.0.0),
                      python-xstatic-angular (>= 1.3.7),
-                     python-xstatic-angular-bootstrap,
-                     python-xstatic-angular-gettext,
-                     python-xstatic-angular-lrdragndrop,
-                     python-xstatic-bootstrap-datepicker (>= 0.0.0.1-3~),
+                     python-xstatic-angular-bootstrap (>= 0.11.0.2),
+                     python-xstatic-angular-gettext (>= 2.1.0.2),
+                     python-xstatic-angular-lrdragndrop (>= 1.0.2.2),
+                     python-xstatic-bootstrap-datepicker (>= 1.3.1.0),
                      python-xstatic-bootstrap-scss (>= 3),
-                     python-xstatic-bootswatch,
-                     python-xstatic-d3,
-                     python-xstatic-font-awesome,
-                     python-xstatic-hogan,
+                     python-xstatic-bootswatch (>= 3.3.5.3),
+                     python-xstatic-d3 (>= 3.1.6.2),
+                     python-xstatic-font-awesome (>= 4.3.0),
+                     python-xstatic-hogan (>= 2.0.0.2),
                      python-xstatic-jasmine (>= 2.1.2.0),
-                     python-xstatic-jquery,
-                     python-xstatic-jquery-migrate,
+                     python-xstatic-jquery (>= 1.7.2),
+                     python-xstatic-jquery-migrate (>= 1.2.1.1),
                      python-xstatic-jquery-ui (>= 1.10.1),
-                     python-xstatic-jquery.quicksearch,
+                     python-xstatic-jquery.quicksearch (>= 2.0.3.1),
                      python-xstatic-jquery.tablesorter (>= 2.14.5.1),
-                     python-xstatic-jsencrypt,
+                     python-xstatic-jsencrypt (>= 2.0.0.2),
                      python-xstatic-magic-search (>= 0.2.5.1),
-                     python-xstatic-mdi,
-                     python-xstatic-rickshaw,
+                     python-xstatic-mdi (>= 1.1.70.1),
+                     python-xstatic-rickshaw (>= 1.5.0),
                      python-xstatic-roboto-fontface (>= 0.4.3.2),
-                     python-xstatic-smart-table,
-                     python-xstatic-spin,
-                     python-xstatic-term.js,
-                     python-xvfbwrapper,
+                     python-xstatic-smart-table (>= 1.4.5.3),
+                     python-xstatic-spin (>= 1.2.5.2),
+                     python-xstatic-term.js (>= 0.0.4),
+                     python-xvfbwrapper (>= 0.1.3),
                      python-yaml,
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://horizon.openstack.org
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/horizon.git;a=summary
-Vcs-Git: git://anonscm.debian.org/openstack/horizon.git
+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
@@ -89,7 +92,7 @@ Architecture: all
 Depends: python-babel (>= 1.3),
          python-ceilometerclient (>= 2.2.1),
          python-cinderclient (>= 1:1.3.1),
-         python-compressor,
+         python-django-compressor (>= 2.0),
          python-django (>= 1.8),
          python-django-babel (>= 0.4.0),
          python-django-openstack-auth (>= 2.0.0),
@@ -134,7 +137,7 @@ Depends: python-babel (>= 1.3),
          python-xstatic-jquery.tablesorter (>= 2.14.5.1),
          python-xstatic-jsencrypt (>= 2.0.0.2),
          python-xstatic-magic-search (>= 0.2.5.1),
-         python-xstatic-mdi,
+         python-xstatic-mdi (>= 1.1.70.1),
          python-xstatic-rickshaw (>= 1.5.0),
          python-xstatic-roboto-fontface (>= 0.4.3.2),
          python-xstatic-smart-table (>= 1.4.5.3),
@@ -164,7 +167,7 @@ Depends: adduser,
          ${shlibs:Depends},
 Suggests: memcached,
           openstack-dashboard-apache,
-Recommends: horizon-vendor-theme,
+Recommends: horizon-vendor-theme
 Description: web application to control an OpenStack cloud
  The OpenStack Dashboard is a web application to control an OpenStack
  cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
index b76de850a42c2e104d92dbeee5240784c0897668..faa22afe896aaac75cb6c669e86d5a3ec7c041df 100644 (file)
@@ -11,25 +11,10 @@ Copyright: 2011 OpenStack LLC
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2011 Julien Danjou <acid@debian.org>
-        2012 Thomas Goirand <zigo@debian.org>
+Copyright: (c) 2011, Julien Danjou <acid@debian.org>
+           (c) 2012-2016, Thomas Goirand <zigo@debian.org>
 License: Apache-2.0
 
-Files: tools/rfc.sh
-Copyright: Copyright (c) 2010-2011 Gluster, Inc
-License: GPL-v3
-
-License: GPL-v3
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
- .
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies of this license
- document, but changing it is not allowed.
- .
- On Debian-based systems the full text of the Apache version 2.0 license can be
- found in `/usr/share/common-licenses/GPL-3'
-
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License"); you may not
  use this file except in compliance with the License. You may obtain a copy of
index b4567e1fecbb1457a29690c4488fca0dffeefc47..ef330dbe353e2078092bc844189dc8cad01aca66 100644 (file)
@@ -1,4 +1,4 @@
+debian/apache-sites-available/openstack-dashboard-alias-only.conf      /etc/apache2/sites-available
 debian/apache-sites-available/openstack-dashboard-ssl-redirect.conf    /etc/apache2/sites-available
 debian/apache-sites-available/openstack-dashboard-ssl.conf     /etc/apache2/sites-available
 debian/apache-sites-available/openstack-dashboard.conf /etc/apache2/sites-available
-debian/apache-sites-available/openstack-dashboard-alias-only.conf      /etc/apache2/sites-available
index 691e0077b3e9ecbabc6c4023834a46e2fc17c7c2..e78f07428719e058f3515524ebe4af2cccf4c225 100644 (file)
@@ -2,6 +2,9 @@
 
 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 -- "$@"
+
 if [ "$1" = "configure" ] ; then
        . /usr/share/debconf/confmodule
        if ! [ -f /etc/default/openstack-dashboard-apache ] ; then
@@ -42,10 +45,13 @@ HORIZON_USE_SSL=yes" >/etc/default/openstack-dashboard-apache
                        a2dissite openstack-dashboard-alias-only.conf
                        a2ensite openstack-dashboard.conf
                fi
-               if [ -d '/usr/share/openstack-dashboard/static' ] ; then
-                       rm -rf /usr/share/openstack-dashboard/static
+               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
+                       fi
+               else
+                       ln -fs /var/lib/openstack-dashboard/static /usr/share/openstack-dashboard/static
                fi
-               ln -s /var/lib/openstack-dashboard/static /usr/share/openstack-dashboard/static
                /usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput
                /usr/share/openstack-dashboard/manage.py compress --force
                if [ -f '/var/lib/openstack-dashboard/secret-key/.secret_key_store' ]; then
@@ -55,27 +61,13 @@ HORIZON_USE_SSL=yes" >/etc/default/openstack-dashboard-apache
                invoke-rc.d --quiet apache2 reload
        else
                sed -i 's#[ \t]*HORIZON_ACTIVATE_VHOSTS=.*#HORIZON_ACTIVATE_VHOSTS=no#' /etc/default/openstack-dashboard-apache
-               site_configs='openstack-dashboard-ssl-redirect.conf
-                       openstack-dashboard-ssl.conf
-                       openstack-dashboard.conf
-                       openstack-dashboard-alias-only.conf'
-               for site_config in $site_configs
-               do
-                       if [ -f /etc/apache2/sites-available/$site_config ]; then
-                               sed -i 's#WSGIScriptAlias / #WSGIScriptAlias /horizon #g' /etc/apache2/sites-available/$site_config
-                       fi
-               done
                a2ensite 000-default.conf || true
                a2ensite default-ssl.conf || true
                sed -i "s|^[ \t]*WEBROOT[ \t]=.*|WEBROOT = '/horizon'|" /etc/openstack-dashboard/local_settings.py
                a2dissite openstack-dashboard.conf
                a2dissite openstack-dashboard-ssl-redirect.conf
                a2dissite openstack-dashboard-ssl.conf
-               a2dissite openstack-dashboard-alias-only.conf
-               if [ -d '/usr/share/openstack-dashboard/static' ] ; then
-                       rm -rf /usr/share/openstack-dashboard/static
-               fi
-               ln -s /var/lib/openstack-dashboard/static /usr/share/openstack-dashboard/static
+               a2ensite openstack-dashboard-alias-only.conf
                /usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput
                /usr/share/openstack-dashboard/manage.py compress --force
                if [ -f /var/lib/openstack-dashboard/secret-key/.secret_key_store ]; then
index e3bebbf248a717a8e84b109afe96a8c4421e8e04..aeec9fa9c7df9530c05c79185e43ff358877fd01 100644 (file)
@@ -2,6 +2,10 @@
 
 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 -- "$@"
+
+
 if [ "${1}" = "purge" ] ; then
        if [ -f /etc/default/openstack-dashboard-apache ] ; then
                rm -rf /etc/default/openstack-dashboard-apache
diff --git a/trusty/debian/openstack-dashboard-apache.preinst b/trusty/debian/openstack-dashboard-apache.preinst
new file mode 100644 (file)
index 0000000..9224298
--- /dev/null
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+set -e
+
+error() {
+       echo "error: $1" >&2
+       exit 1
+}
+
+dir_to_symlink_preinst() {
+       local PATHNAME="$1"
+       local SYMLINK_TARGET="$2"
+       local LASTVERSION="$3"
+       local PACKAGE="$4"
+
+       # Skip remaining parameters up to --
+       while [ "$1" != "--" -a $# -gt 0 ]; do shift; done
+       shift
+
+       if [ -n "$DPKG_MAINTSCRIPT_NAME" ] || error "environment variable DPKG_MAINTSCRIPT_NAME is required"
+       [ -n "$1" ] || error "maintainer script parameters are missing"
+
+       [ -n "$2" ] && [ ! -h "$PATHNAME" ] && [ -d "$PATHNAME" ] && dpkg --compare-versions "$2" le-nl "$LASTVERSION"; then
+               mv -f "$PATHNAME" "${PATHNAME}.dpkg-backup"
+               mkdir "$PATHNAME"
+               touch "$PATHNAME/.dpkg-staging-dir"
+       fi
+}
+
+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 -- "$@"
+       fi
+       dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard-apache -- "$@"
+fi
+
+#DEBHELPER#
index 3bb4e8a143dd43e9c71bfeb09afe29799a42290b..3c4b05ea67d8fc93d106e9118f90c34f580a81e2 100644 (file)
@@ -2,6 +2,9 @@
 
 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 -- "$@"
+
 if [ "$1" = "configure" ] ; then
        adduser --system \
                --home /var/lib/horizon \
@@ -17,10 +20,13 @@ if [ "$1" = "configure" ] ; then
                cp /usr/share/openstack-dashboard/local_settings.py /etc/openstack-dashboard/local_settings.py
        fi
 
-       if [ -d '/usr/share/openstack-dashboard/static' ] ; then
-               rm -rf /usr/share/openstack-dashboard/static
+       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
+               fi
+       else
+               ln -fs /var/lib/openstack-dashboard/static /usr/share/openstack-dashboard/static
        fi
-       ln -s /var/lib/openstack-dashboard/static /usr/share/openstack-dashboard/static
 
        # Compress the JS and CSS with python-compressor and python-lesscpy
        /usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput
index d24be7748036876c270a8bbd5bc6bd1e6aa97416..eb967542a0b2289432c7266d01efd3bd601205d5 100644 (file)
@@ -2,6 +2,9 @@
 
 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 -- "$@"
+
 if [ "${1}" = "purge" ] ; then
        rm -f /etc/openstack-dashboard/local_settings.py
        rmdir --ignore-fail-on-non-empty /etc/openstack-dashboard || true
diff --git a/trusty/debian/openstack-dashboard.preinst b/trusty/debian/openstack-dashboard.preinst
new file mode 100644 (file)
index 0000000..3916bba
--- /dev/null
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+set -e
+
+error() {
+       echo "error: $1" >&2
+       exit 1
+}
+
+dir_to_symlink_preinst() {
+       local PATHNAME="$1"
+       local SYMLINK_TARGET="$2"
+       local LASTVERSION="$3"
+       local PACKAGE="$4"
+
+       # Skip remaining parameters up to --
+       while [ "$1" != "--" -a $# -gt 0 ]; do shift; done
+       shift
+
+       if [ -n "$DPKG_MAINTSCRIPT_NAME" ] || error "environment variable DPKG_MAINTSCRIPT_NAME is required"
+       [ -n "$1" ] || error "maintainer script parameters are missing"
+
+       [ -n "$2" ] && [ ! -h "$PATHNAME" ] && [ -d "$PATHNAME" ] && dpkg --compare-versions "$2" le-nl "$LASTVERSION"; then
+               mv -f "$PATHNAME" "${PATHNAME}.dpkg-backup"
+               mkdir "$PATHNAME"
+               touch "$PATHNAME/.dpkg-staging-dir"
+       fi
+}
+
+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 -- "$@"
+       fi
+       dir_to_symlink_preinst /usr/share/openstack-dashboard/static /var/lib/openstack-dashboard/static 9.0.0~rc1-2 openstack-dashboard -- "$@"
+fi
+
+#DEBHELPER#
index 3bc8167fd1828b082261c1a0094aafac11df4cd7..f121264091d9d5eeadc7ad7c41352bfb447e371a 100644 (file)
@@ -1,18 +1,18 @@
-interest /usr/lib/python2.7/dist-packages/xstatic/pkg/bootstrap_scss/data
-interest /usr/lib/python2.7/dist-packages/xstatic/pkg/jasmine/data
-interest /usr/share/javascript/angular.js
-interest /usr/share/javascript/d3
-interest /usr/share/javascript/jquery
-interest /usr/share/javascript/jquery-cookie
-interest /usr/share/javascript/jquery-metadata
-interest /usr/share/javascript/jquery.quicksearch
-interest /usr/share/javascript/jquery-tablesorter
-interest /usr/share/javascript/jquery-ui
-interest /usr/share/javascript/jsencrypt
-interest /usr/share/javascript/qunit
-interest /usr/share/javascript/rickshaw
-interest /usr/share/javascript/spin.js
-interest /usr/share/javascript/underscore
-interest /usr/share/twitter-bootstrap/files
-interest /usr/share/javascript/term.js
-interest /usr/share/javascript/lrDragNDrop
+interest-noawait /usr/lib/python2.7/dist-packages/xstatic/pkg/bootstrap_scss/data
+interest-noawait /usr/lib/python2.7/dist-packages/xstatic/pkg/jasmine/data
+interest-noawait /usr/share/javascript/angular.js
+interest-noawait /usr/share/javascript/d3
+interest-noawait /usr/share/javascript/jquery
+interest-noawait /usr/share/javascript/jquery-cookie
+interest-noawait /usr/share/javascript/jquery-metadata
+interest-noawait /usr/share/javascript/jquery.quicksearch
+interest-noawait /usr/share/javascript/jquery-tablesorter
+interest-noawait /usr/share/javascript/jquery-ui
+interest-noawait /usr/share/javascript/jsencrypt
+interest-noawait /usr/share/javascript/qunit
+interest-noawait /usr/share/javascript/rickshaw
+interest-noawait /usr/share/javascript/spin.js
+interest-noawait /usr/share/javascript/underscore
+interest-noawait /usr/share/twitter-bootstrap/files
+interest-noawait /usr/share/javascript/term.js
+interest-noawait /usr/share/javascript/lrDragNDrop
index 310c44d37dcd536aec2f723dd83d6b59647c2c9c..eec0e93930c757e1534aa126b35dc9b8814c4a50 100644 (file)
@@ -2,19 +2,22 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the horizon package.
 # victory <victory.deb@gmail.com>, 2013.
+# Takuma Yamada <tyamada@takumayamada.com>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: horizon\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
 "POT-Creation-Date: 2015-09-22 13:31+0000\n"
-"PO-Revision-Date: 2013-07-19 23:32+0900\n"
-"Last-Translator: victory <victory.deb@gmail.com>\n"
+"PO-Revision-Date: 2016-02-22 13:28+0900\n"
+"Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #. Type: boolean
 #. Description
@@ -39,6 +42,8 @@ msgid ""
 "If this option is not selected, Horizon will be installed using /horizon "
 "instead of the webroot."
 msgstr ""
+"このオプションが選択されていない場合は、Horizon は webroot ではなく /horizon "
+"を使用してインストールされます。"
 
 #. Type: boolean
 #. Description
index def81262358c3318256ca4bc8049051271ac3404..09ae0271986520179f64676ac2337d7a80e02b1d 100644 (file)
@@ -1,21 +1,22 @@
 # Dutch translation of horizon debconf templates.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the horizon package.
-# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014.
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014, 2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: horizon\n"
 "Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
 "POT-Creation-Date: 2015-09-22 13:31+0000\n"
-"PO-Revision-Date: 2014-10-08 23:05+0200\n"
+"PO-Revision-Date: 2015-10-30 22:09+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
-"Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #. Type: boolean
 #. Description
@@ -40,6 +41,8 @@ msgid ""
 "If this option is not selected, Horizon will be installed using /horizon "
 "instead of the webroot."
 msgstr ""
+"Indien deze optie niet gekozen wordt, zal de installatie van Horizon de map /"
+"horizon gebruiken in plaats van de web-hoofdmap."
 
 #. Type: boolean
 #. Description
diff --git a/trusty/debian/po/pt_BR.po b/trusty/debian/po/pt_BR.po
new file mode 100644 (file)
index 0000000..21ffee6
--- /dev/null
@@ -0,0 +1,70 @@
+# Debconf translations for horizon.
+# Copyright (C) 2016 THE horizon'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the horizon package.
+# Adriano Rafael Gomes <adrianorg@arg.eti.br>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: horizon\n"
+"Report-Msgid-Bugs-To: horizon@packages.debian.org\n"
+"POT-Creation-Date: 2015-09-22 13:31+0000\n"
+"PO-Revision-Date: 2016-02-07 21:55-0200\n"
+"Last-Translator: Adriano Rafael Gomes <adrianorg@arg.eti.br>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
+"org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid "Activate Dashboard and disable default VirtualHost?"
+msgstr "Ativar o Dashboard e desabilitar o VirtualHost padrão?"
+
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"The Apache package sets up a default web site and a default page, configured "
+"in /etc/apache2/sites-available/default."
+msgstr ""
+"O pacote do Apache define um site web padrão e uma página padrão, "
+"configurados em /etc/apache2/sites-available/default."
+
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"If this option is not selected, Horizon will be installed using /horizon "
+"instead of the webroot."
+msgstr ""
+"Se essa opção não for selecionada, o Horizon será instalado usando /horizon "
+"em vez da raiz web (\"webroot\")."
+
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:2001
+msgid ""
+"Choose this option to replace that default with the OpenStack Dashboard "
+"configuration."
+msgstr ""
+"Escolha essa opção para substituir esse padrão pela configuração do "
+"OpenStack Dashboard."
+
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:3001
+msgid "Should the Dashboard use HTTPS?"
+msgstr "O Dashboard deverá usar HTTPS?"
+
+#. Type: boolean
+#. Description
+#: ../openstack-dashboard-apache.templates:3001
+msgid ""
+"Select this option if you would like Horizon to be served over HTTPS only, "
+"with a redirection to HTTPS if HTTP is in use."
+msgstr ""
+"Selecione essa opção se você gostaria que o Horizon fosse servido somente "
+"sobre HTTPS, com um redirecionamento para HTTPS se HTTP for usado."