From 50a3a4ecc96249e2ceddd76b4e12d8dd3fb507a5 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Fri, 25 Mar 2016 10:32:48 +0100
Subject: [PATCH] Add all the rest of the services in the "designate"
 meta-package.

---
 debian/changelog             |  6 ++++++
 debian/control               | 15 ++++++++++-----
 debian/designate-common.dirs |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 963e7002..050c82f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+designate (1:2.0.0~rc1-2) UNRELEASED; urgency=medium
+
+  * Add all the rest of the services in the "designate" meta-package.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 25 Mar 2016 10:32:29 +0100
+
 designate (1:2.0.0~rc1-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 05289193..51bf94e6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: designate
 Section: net
 Priority: extra
 Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
-Uploaders: Thomas Goirand <zigo@debian.org>
+Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
@@ -56,10 +56,10 @@ Build-Depends-Indep: bandit,
                      python-requests-mock (>= 0.7.0),
                      python-routes,
                      python-six (>= 1.9.0),
-                     python-suds,
                      python-sphinxcontrib-httpdomain,
                      python-sqlalchemy (>= 1.0.10),
                      python-stevedore (>= 1.5.0),
+                     python-suds,
                      python-tempest-lib (>= 0.14.0),
                      python-testscenarios,
                      python-testtools (>= 1.4.0),
@@ -116,15 +116,15 @@ Depends: python-babel,
          python-requests (>= 2.8.1),
          python-routes,
          python-six (>= 1.9.0),
-         python-suds,
          python-sqlalchemy (>= 1.0.10),
          python-stevedore (>= 1.5.0),
+         python-suds,
          python-tooz (>= 1.28.0),
          python-webob,
          python-werkzeug,
          ${misc:Depends},
          ${python:Depends},
-Provides: ${python:Provides}
+Provides: ${python:Provides},
 XB-Python-Version: ${python:Versions}
 Description: OpenStack DNS as a Service - Python libs
  Designate provides DNSaaS services for OpenStack. It provides a multi-tenant
@@ -158,6 +158,10 @@ Depends: designate-agent (= ${binary:Version}),
          designate-api (= ${binary:Version}),
          designate-central (= ${binary:Version}),
          designate-common (= ${binary:Version}),
+         designate-mdns (= ${binary:Version}),
+         designate-pool-manager (= ${binary:Version}),
+         designate-sink (= ${binary:Version}),
+         designate-zone-manager (= ${binary:Version}),
          ${misc:Depends},
          ${python:Depends},
 Description: OpenStack DNS as a Service - metapackage
@@ -279,7 +283,8 @@ Description: OpenStack DNS as a Service - zone manager
 Package: designate-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends},
 Description: OpenStack DNS as a Service - doc
  Designate provides DNSaaS services for OpenStack. It provides a multi-tenant
  REST API for domain & record management. It is Integrated with Keystone for
diff --git a/debian/designate-common.dirs b/debian/designate-common.dirs
index 0b6a24fe..d6eafe12 100644
--- a/debian/designate-common.dirs
+++ b/debian/designate-common.dirs
@@ -1,5 +1,5 @@
 etc/designate
 etc/designate/conf.d
+usr/share/designate
 var/lib/designate
 var/log/designate
-usr/share/designate