Fixed openstack-auth -> django-openstack-auth depends.

Rewritten-From: 0e4ad6c97b41cbe66a465afb9df3d1d049861adb

diff --git a/trusty/debian/control b/trusty/debian/control
index 8a19fcea9ae777885835dd292d3854003250e36f..7844df342b04f505977dc97e398289814c3d0270 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -20,6 +20,7 @@ Build-Depends-Indep: gettext,
                      python-django (>= 1.8),
                      python-django-babel,
                      python-django-nose,
+                     python-django-openstack-auth (>= 2.0.0),
                      python-django-pyscss (>= 2.0.2),
                      python-eventlet (>= 0.17.4),
                      python-glanceclient (>= 1:0.18.0),
@@ -38,7 +39,6 @@ Build-Depends-Indep: gettext,
                      python-nosehtmloutput,
                      python-nosexcover,
                      python-novaclient (>= 2:2.29.0),
-                     python-openstack-auth (>= 2.0.0),
                      python-openstack.nose-plugin,
                      python-oslo.concurrency (>= 2.3.0),
                      python-oslo.config (>= 1:3.0.0),
@@ -96,6 +96,7 @@ Depends: python-babel,
          python-compressor,
          python-django (>= 1.8),
          python-django-babel,
+         python-django-openstack-auth (>= 2.0.0),
          python-django-pyscss (>= 2.0.2),
          python-eventlet (>= 0.17.4),
          python-glanceclient (>= 1:0.18.0),
@@ -108,7 +109,6 @@ Depends: python-babel,
          python-netaddr (>= 0.7.12),
          python-neutronclient (>= 1:2.6.0),
          python-novaclient (>= 2:2.29.0),
-         python-openstack-auth (>= 2.0.0),
          python-oslo.concurrency (>= 2.3.0),
          python-oslo.config (>= 1:3.0.0),
          python-oslo.i18n (>= 1.5.0),

diff --git a/trusty/debian/openstack-dashboard-apache.install b/trusty/debian/openstack-dashboard-apache.install
index b4567e1fecbb1457a29690c4488fca0dffeefc47..ef330dbe353e2078092bc844189dc8cad01aca66 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.install
+++ b/trusty/debian/openstack-dashboard-apache.install
@@ -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