* Added Build-Conflicts: python-rednose.

  * Standards-Version is now 3.9.6 (no change).

Rewritten-From: 0e0b20a8af33e77d0b4e7a4b27e469e3519ee8fb

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index ed4fd821ad6b008114ecd33dcbbb625ed01dfe2e..0e7c0ec00442d90c94e4d5271572823a18b3596f 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -5,6 +5,8 @@ horizon (2015.1.0+2015.06.09.git15.e63af6c598-1) unstable; urgency=medium
   * Fixed double entry in openstack-dashboard.triggers.
   * Dropped patch applied upstream:
     - Persistent_XSS_in_Horizon_metadata_dashboard.patch
+  * Added Build-Conflicts: python-rednose.
+  * Standards-Version is now 3.9.6 (no change).
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 08 Jun 2015 16:26:13 +0200
 

diff --git a/xenial/debian/control b/xenial/debian/control
index 66123d00b6f049e42795da8a24060593ec587bad..7d4e21d81343bd76f9666e0bc48f075fa7f0160a 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -2,10 +2,7 @@ Source: horizon
 Section: net
 Priority: extra
 Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
-Uploaders: Julien Danjou <acid@debian.org>,
-           Thomas Goirand <zigo@debian.org>,
-           Mehdi Abaakouk <sileht@sileht.net>,
-           Gonéri Le Bouder <goneri@debian.org>
+Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                openstack-pkg-tools,
@@ -80,8 +77,9 @@ Build-Depends-Indep: gettext,
                      python-xstatic-term.js,
                      python-xvfbwrapper,
                      python-yaml,
-Build-Conflicts: python-unittest2
-Standards-Version: 3.9.5
+Build-Conflicts: python-rednose,
+                 python-unittest2,
+Standards-Version: 3.9.6
 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
@@ -89,7 +87,7 @@ Vcs-Git: git://anonscm.debian.org/openstack/horizon.git
 Package: python-django-horizon
 Section: python
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
+Pre-Depends: dpkg (>= 1.15.6~),
 Depends: python-babel,
          python-ceilometerclient (>= 1.0.13),
          python-cinderclient (>= 1:1.1.0),
@@ -145,7 +143,7 @@ Depends: python-babel,
          python-yaml,
          ${misc:Depends},
          ${python:Depends},
-Recommends: memcached
+Recommends: memcached,
 Description: Django module providing web interaction with OpenStack
  The OpenStack Dashboard is a web application to control an OpenStack
  cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
@@ -157,15 +155,16 @@ Description: Django module providing web interaction with OpenStack
 
 Package: openstack-dashboard
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
+Pre-Depends: dpkg (>= 1.15.6~),
 Depends: adduser,
          libjs-jquery,
          libjs-jquery-cookie,
          python-django-horizon (= ${source:Version}),
          ${misc:Depends},
          ${python:Depends},
-         ${shlibs:Depends}
-Recommends: memcached, openstack-dashboard-apache
+         ${shlibs:Depends},
+Recommends: memcached,
+            openstack-dashboard-apache,
 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
@@ -174,11 +173,11 @@ Description: web application to control an OpenStack cloud
 
 Package: openstack-dashboard-apache
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
+Pre-Depends: dpkg (>= 1.15.6~),
 Depends: debconf,
          libapache2-mod-wsgi (>= 2.3),
          openstack-dashboard,
-         ${misc:Depends}
+         ${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