Fixes python-pbr and python-d2to1 minimum versions

Change-Id: I0a2da3ba842b46c736d8268927265897f4ad171a

Rewritten-From: 9c96363fcfd49f2014ff64d8864dc8a8d08de1e2

diff --git a/xenial/debian/control b/xenial/debian/control
index cd6c56818520a8f8b307c474d48ed47004adfada..3ba3069271e82463fadd8654317f89e4aec4abc8 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -8,6 +8,8 @@ Uploaders: Julien Danjou <acid@debian.org>,
 Build-Depends: debhelper (>= 9),
                po-debconf,
                python-all (>= 2.6.6-3~),
+               python-d2to1 (>= 0.2.10),
+               python-pbr (>= 0.5.21),
                python-setuptools
 Build-Depends-Indep: node-less,
                      nodejs-legacy,
@@ -19,7 +21,6 @@ Build-Depends-Indep: node-less,
                      python-cloudfiles,
                      python-compressor (>= 1.3),
                      python-coverage,
-                     python-d2to1 (>= 0.2.10),
                      python-django-nose,
                      python-docutils,
                      python-eventlet (>= 0.12.0),
@@ -34,12 +35,11 @@ Build-Depends-Indep: node-less,
                      python-netaddr,
                      python-neutronclient (>= 2.2.3),
                      python-nose,
-                     python-nosexcover,
                      python-nosehtmloutput,
+                     python-nosexcover,
                      python-novaclient (>= 2:2.10),
-                     python-openstack.nose-plugin,
                      python-openstack-auth (>= 1.0.11),
-                     python-pbr,
+                     python-openstack.nose-plugin,
                      python-sphinx,
                      python-swiftclient,
                      python-tz

diff --git a/xenial/debian/openstack-dashboard-apache.install b/xenial/debian/openstack-dashboard-apache.install
index 504b1c96fc2795cec0a2ccd4ba2a978b859bc1f2..08de3d0d46569a92b141b9bde58b20c2473ace55 100644 (file)
--- a/xenial/debian/openstack-dashboard-apache.install
+++ b/xenial/debian/openstack-dashboard-apache.install
@@ -1,3 +1,3 @@
-debian/apache-sites-available/openstack-dashboard.conf /etc/apache2/sites-available
-debian/apache-sites-available/openstack-dashboard-ssl.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