Removed Pre-Depends on dpkg.

[openstack-build/ceilometer-build.git] / trusty / debian / control

diff --git a/trusty/debian/control b/trusty/debian/control
index 4357d2f4c519807f1efd1442c3613ceaaa29e5cb..08e588e1ce934fbfae8b4e5c3c133205d7c6f2d2 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -10,11 +10,13 @@ Build-Depends: debhelper (>= 9),
                dh-systemd,
                openstack-pkg-tools (>= 23~),
                po-debconf,
-               python-all (>= 2.6.6-3~),
+               python-all,
                python-pbr,
+               python-setuptools,
                python-sphinx,
 Build-Depends-Indep: alembic (>= 0.7.2),
                      mongodb,
+                     python-awsauth,
                      python-babel,
                      python-ceilometerclient (>= 1.0.13),
                      python-coverage,
@@ -62,7 +64,6 @@ Build-Depends-Indep: alembic (>= 0.7.2),
                      python-pymongo,
                      python-pysnmp4,
                      python-requests,
-                     python-requests-aws (>= 0.1.4),
                      python-retrying,
                      python-six (>= 1.9.0),
                      python-sphinxcontrib-docbookrestapi,
@@ -89,7 +90,6 @@ Homepage: http://wiki.openstack.org/Ceilometer
 Package: python-ceilometer
 Section: python
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: alembic (>= 0.7.2),
          libjs-jquery,
          python-ceilometerclient (>= 1.0.13),
@@ -100,6 +100,7 @@ Depends: alembic (>= 0.7.2),
          python-iso8601,
          python-jsonpath-rw,
          python-jsonschema,
+         python-kafka,
          python-keystoneclient (>= 1:1.1.0),
          python-keystonemiddleware (>= 1.5.0),
          python-kombu (>= 2.4.8),
@@ -153,7 +154,6 @@ Description: OpenStack efficient metering counters system - Python libraries
 
 Package: ceilometer-common
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: adduser,
          dpkg-dev,
          python-ceilometer (= ${binary:Version}),
@@ -172,7 +172,6 @@ Description: OpenStack efficient metering counters system - common files
 
 Package: ceilometer-collector
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ceilometer-common (= ${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
@@ -187,9 +186,26 @@ Description: OpenStack efficient metering counters system - collector service
  .
  This package contains the collector service.
 
+Package: ceilometer-polling
+Architecture: all
+Depends:
+ ceilometer-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${ostack-lsb-base},
+ ${python:Depends}
+Suggests: mongodb
+Description: OpenStack efficient metering counters system - polling service
+ Ceilometer aims to deliver a Single Point Of Contact for billing systems,
+ providing all the counters they need to establish customer billing, across
+ all current and future OpenStack components. The delivery of counters must be
+ traceable and auditable, the counters must be easily extensible to support new
+ projects, and agents doing data collections should be independent of the
+ overall system.
+ .
+ This package contains the polling service.
+
 Package: ceilometer-api
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: adduser,
          ceilometer-common (= ${binary:Version}),
          debconf,
@@ -208,7 +224,6 @@ Description: OpenStack efficient metering counters system (API service)
 
 Package: ceilometer-agent-compute
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ceilometer-common (= ${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
@@ -225,7 +240,6 @@ Description: OpenStack efficient metering counters system - compute agent
 
 Package: ceilometer-agent-central
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ceilometer-common (= ${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
@@ -240,14 +254,13 @@ Description: OpenStack efficient metering counters system - central agent
  .
  This package contains the central agent.
 
-Package: ceilometer-alarm-evaluator
+Package: ceilometer-agent-ipmi
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ceilometer-common (= ${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
          ${python:Depends},
-Description: OpenStack efficient metering counters system - alarm evaluator
+Description: OpenStack efficient metering counters system - IPMI agent
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
  providing all the counters they need to establish customer billing, across
  all current and future OpenStack components. The delivery of counters must be
@@ -255,16 +268,15 @@ Description: OpenStack efficient metering counters system - alarm evaluator
  projects, and agents doing data collections should be independent of the
  overall system.
  .
- This package contains the alarm evaluator daemon.
+ This package contains the IPMI agent daemon.
 
-Package: ceilometer-alarm-notifier
+Package: ceilometer-agent-notification
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ceilometer-common (= ${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
          ${python:Depends},
-Description: OpenStack efficient metering counters system - alarm notifier
+Description: OpenStack efficient metering counters system - agent notification
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
  providing all the counters they need to establish customer billing, across
  all current and future OpenStack components. The delivery of counters must be
@@ -272,16 +284,15 @@ Description: OpenStack efficient metering counters system - alarm notifier
  projects, and agents doing data collections should be independent of the
  overall system.
  .
- This package contains the alarm notifier daemon.
+ This package contains the notification agent daemon.
 
-Package: ceilometer-agent-notification
+Package: ceilometer-alarm-evaluator
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ceilometer-common (= ${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
          ${python:Depends},
-Description: OpenStack efficient metering counters system - agent notification
+Description: OpenStack efficient metering counters system - alarm evaluator
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
  providing all the counters they need to establish customer billing, across
  all current and future OpenStack components. The delivery of counters must be
@@ -289,16 +300,15 @@ Description: OpenStack efficient metering counters system - agent notification
  projects, and agents doing data collections should be independent of the
  overall system.
  .
- This package contains the notification agent daemon.
+ This package contains the alarm evaluator daemon.
 
-Package: ceilometer-agent-ipmi
+Package: ceilometer-alarm-notifier
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~)
 Depends: ceilometer-common (= ${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
          ${python:Depends},
-Description: OpenStack efficient metering counters system - IPMI agent
+Description: OpenStack efficient metering counters system - alarm notifier
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
  providing all the counters they need to establish customer billing, across
  all current and future OpenStack components. The delivery of counters must be
@@ -306,4 +316,4 @@ Description: OpenStack efficient metering counters system - IPMI agent
  projects, and agents doing data collections should be independent of the
  overall system.
  .
- This package contains the IPMI agent daemon.
+ This package contains the alarm notifier daemon.