[MOS 10.0] Update horizon package

Version: 3:10.0.0-1~u16.04+mos0
Fix (build-)dependencies.

Change-Id: If9df8726b21b65ea4209a757f5ca3818f1bb695e

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 1f2596b22738cd47806714d2f646c3ebec336eb9..a3d026debde891569999cb43b6336a4474e9c68c 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,78 @@
+horizon (3:10.0.0-1~u16.04+mos0) mos10.0; urgency=medium
+
+  * Fix (build-)dependencies.
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Sat, 29 Oct 2016 15:16:20 +0300
+
+horizon (3:10.0.0-2) unstable; urgency=medium
+
+  * Added missing path in debian/openstack-dashboard.triggers.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 14 Oct 2016 17:35:09 +0200
+
+horizon (3:10.0.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 06 Oct 2016 17:51:41 +0200
+
+horizon (3:10.0.0~rc2-3) unstable; urgency=medium
+
+  * Uploading to unstable (Closes: #832338).
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 04 Oct 2016 09:39:39 +0200
+
+horizon (3:10.0.0~rc2-2) experimental; urgency=medium
+
+  * Add patch to use /tmp for the SECRET_KEY during tests, instead of the
+    openstack_dashboard/test folder, which isn't suitable for plugins, and
+    which would make them FTBFS.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 29 Sep 2016 11:45:54 +0200
+
+horizon (3:10.0.0~rc2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release, including 3 new XStatic packages.
+  * Using OpenStack's Gerrit as VCS URLs.
+  * .gitreview file points to deb-horizon in OpenStack Gerrit.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 13 Sep 2016 22:13:09 +0200
+
+horizon (3:10.0.0~b2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Updated Danish translation of debconf templates (Closes: #830639).
+  * Remove CVE-2016-4428_Escape_angularjs_templating_in_unsafe_HTML.patch
+    applied upstream.
+  * Add BaseCommand.option_list-is-gone-from-django1.10.patch.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 11 Jul 2016 14:24:50 +0200
+
+horizon (3:10.0.0~b2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Updated Danish translation of debconf templates (Closes: #830639).
+  * Remove CVE-2016-4428_Escape_angularjs_templating_in_unsafe_HTML.patch
+    applied upstream.
+  * Add BaseCommand.option_list-is-gone-from-django1.10.patch.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 11 Jul 2016 14:24:50 +0200
+
+horizon (3:10.0.0~b1-3) experimental; urgency=medium
+
+  * Adds CVE-2016-4428_Escape_angularjs_templating_in_unsafe_HTML.patch.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 29 Jun 2016 14:51:26 +0200
+
+horizon (3:10.0.0~b1-2) experimental; urgency=medium
+
+  * Increasing the EPOC after an unfortunate upload to unstable.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 28 Jun 2016 08:02:20 +0000
+
 horizon (2:10.0.0~b2-1~u16.04+mos0) mos10.0; urgency=medium
 
   * Update to 10.0.0~b2
@@ -5,6 +80,30 @@ horizon (2:10.0.0~b2-1~u16.04+mos0) mos10.0; urgency=medium
 
  -- Mikhail Ivanov <mivanov@mirantis.com>  Thu, 18 Aug 2016 18:36:41 +0300
 
+horizon (2:10.0.0~b2-1~u16.04+mos0) mos10.0; urgency=medium
+
+  * Update to 10.0.0~b2
+  * Fix (build-)depends
+
+ -- Mikhail Ivanov <mivanov@mirantis.com>  Thu, 18 Aug 2016 18:36:41 +0300
+
+horizon (2:10.0.0~b1-1~u16.04+mos0) mos10.0; urgency=medium
+
+  * Source: http://http.debian.net/debian/pool/main/h/horizon/horizon_10.0.0~b1-1.dsc
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Fri, 24 Jun 2016 19:21:06 +0300
+
+horizon (2:10.0.0~b1-1) unstable; urgency=medium
+
+  [ Ivan Udovichenko ]
+  * New upstream release.
+  * Fix (build-)dependencies.
+
+  [ Thomas Goirand ]
+  * Removed Fix_remaining_Django_1.9_test_failures.patch applied upstream.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 10 Jun 2016 16:39:20 +0200
+
 horizon (2:10.0.0~b1-1~u16.04+mos0) mos10.0; urgency=medium
 
   * Source: http://http.debian.net/debian/pool/main/h/horizon/horizon_10.0.0~b1-1.dsc

diff --git a/xenial/debian/control b/xenial/debian/control
index 81ecac7cb6fd1c37a6f1ed216f7dbd3889698769..f5902b3c591f8a2693dd7fdb57a2f9f7a493b461 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -17,22 +17,22 @@ Build-Depends-Indep: gettext,
                      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-django (>= 1.8),
+                     python-django-compressor (>= 2.0),
                      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.3.0),
                      python-hacking (>= 0.10.0),
-                     python-heatclient (>= 1.1.0),
+                     python-heatclient (>= 1.4.0),
                      python-iso8601 (>= 0.1.11),
                      python-keystoneclient (>= 1:2.0.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),
@@ -46,6 +46,7 @@ Build-Depends-Indep: gettext,
                      python-oslo.serialization (>= 2.0.0),
                      python-oslo.utils (>= 3.16.0),
                      python-oslosphinx (>= 2.5.0),
+                     python-pep8,
                      python-pint (>= 0.5),
                      python-pyscss (>= 1.3.4),
                      python-selenium,
@@ -85,9 +86,9 @@ Build-Depends-Indep: gettext,
                      python-xvfbwrapper (>= 0.1.3),
                      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
+Vcs-Browser: https://git.openstack.org/cgit/openstack/deb-horizon?h=debian%2Fnewton
+Vcs-Git: https://git.openstack.org/openstack/deb-horizon -b debian/newton
+Homepage: https://horizon.openstack.org
 
 Package: python-django-horizon
 Section: python
@@ -95,18 +96,18 @@ Architecture: all
 Depends: python-babel (>= 2.3.4),
          python-ceilometerclient (>= 2.5.0),
          python-cinderclient (>= 1:1.6.0),
-         python-django-compressor (>= 2.0),
          python-django (>= 1.8),
          python-django-babel (>= 0.5.1),
+         python-django-compressor (>= 2.0),
          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.3.0),
+         python-heatclient (>= 1.4.0),
          python-iso8601 (>= 0.1.11),
          python-keystoneclient (>= 1:2.0.0),
          python-memcache,
-         python-netaddr (>= 0.7.12),
-         python-neutronclient (>= 1:4.2.0),
+         python-netaddr (>= 0.7.13),
+         python-neutronclient (>= 1:5.1.0),
          python-novaclient (>= 2:2.29.0),
          python-oslo.concurrency (>= 3.8.0),
          python-oslo.config (>= 1:3.14.0),

diff --git a/xenial/debian/openstack-dashboard.triggers b/xenial/debian/openstack-dashboard.triggers
index f121264091d9d5eeadc7ad7c41352bfb447e371a..79db8760e26eb7e06d35265692671db2bdb96e7f 100644 (file)
--- a/xenial/debian/openstack-dashboard.triggers
+++ b/xenial/debian/openstack-dashboard.triggers
@@ -16,3 +16,5 @@ 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
+interest-noawait /usr/share/javascript/tv4
+interest-noawait /usr/share/javascript/objectpath

diff --git a/xenial/debian/po/da.po b/xenial/debian/po/da.po
index 31e3f015f6269367a1f64d54c83e85d3319dde7e..c3841c1f9e60195d5d65a4ad112a61de628ba830 100644 (file)
--- a/xenial/debian/po/da.po
+++ b/xenial/debian/po/da.po
@@ -1,14 +1,14 @@
 # Danish translation horizon.
-# Copyright (C) 2013 horizon & nedenstående oversættere.
+# Copyright (C) 2016 horizon & nedenstående oversættere.
 # This file is distributed under the same license as the horizon package.
-# Joe Hansen <joedalton2@yahoo.dk>, 2013.
+# Joe Hansen <joedalton2@yahoo.dk>, 2013, 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-10-10 23:51+0200\n"
+"PO-Revision-Date: 2016-07-09 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
 "Language: da\n"
@@ -39,6 +39,8 @@ msgid ""
 "If this option is not selected, Horizon will be installed using /horizon "
 "instead of the webroot."
 msgstr ""
+"Hvis denne indstilling ikke er valgt, så vil Horizon blive installeret "
+"via /horizon i stedet for webroot'en."
 
 #. Type: boolean
 #. Description

diff --git a/xenial/debian/source/options b/xenial/debian/source/options
index ec30cb9e854aaf1f79ba2132776feec61e96fb59..65eb4cda4dc6a032d190959edde384ecb6bc930c 100644 (file)
--- a/xenial/debian/source/options
+++ b/xenial/debian/source/options
@@ -1 +1,3 @@
 extend-diff-ignore = ".*\.secret_key_store|.*\.mo"
+extend-diff-ignore = "^[^/]*[.]egg-info/"
+extend-diff-ignore = "^[.]gitreview$"