Forward the move of libapache-mod-wsgi to the debian/juno branch.

Rewritten-From: b9e1e3dae2f38a57e9c43b1ad7745cd6537a849a

diff --git a/trusty/debian/control b/trusty/debian/control
index 625600e2e10438da286758986212909db10dc96e..3bf18e1fc5b0013addbd4f7ed94905b5ce68394b 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -7,10 +7,10 @@ Uploaders: Julien Danjou <acid@debian.org>,
            Mehdi Abaakouk <sileht@sileht.net>,
            Gonéri Le Bouder <goneri@debian.org>
 Build-Depends: debhelper (>= 9),
+               openstack-pkg-tools,
                po-debconf,
                python-all (>= 2.6.6-3~),
                python-pbr (>= 0.6),
-               openstack-pkg-tools,
                python-setuptools,
                python-sphinx
 Build-Depends-Indep: python-ceilometerclient (>= 1.0.6),
@@ -35,9 +35,9 @@ Build-Depends-Indep: python-ceilometerclient (>= 1.0.6),
                      python-netaddr,
                      python-neutronclient (>= 2.3.5),
                      python-nose,
+                     python-nose-exclude,
                      python-nosehtmloutput,
                      python-nosexcover,
-                     python-nose-exclude,
                      python-novaclient (>= 2:2.17.0),
                      python-openstack-auth (>= 1.1.6),
                      python-openstack.nose-plugin,
@@ -107,7 +107,6 @@ Package: openstack-dashboard
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: adduser,
-         libapache2-mod-wsgi (>= 2.3),
          libjs-jquery,
          libjs-jquery-cookie,
          python-django-horizon (= ${source:Version}),
@@ -124,7 +123,10 @@ Description: OpenStack Dashboard
 Package: openstack-dashboard-apache
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: debconf, openstack-dashboard, ${misc:Depends}
+Depends: debconf,
+         libapache2-mod-wsgi (>= 2.3),
+         openstack-dashboard,
+         ${misc:Depends}
 Description: OpenStack Dashboard - Apache support
  The OpenStack Dashboard is a web application to control an OpenStack
  cloud. It connects to OpenStack services such as Nova, Swift, or Keystone