Merge branch 'debian/havana' of ssh://git.debian.org/git/openstack/ceilometer into...

Rewritten-From: 83d61dc6540e706deda6a4183d1c5223e82ff7cf

diff --combined xenial/debian/changelog
index 6b620679c9b4e7ca93b255b70d45f19df69f9638,cd4279ffc4d072c502e71bcc2a900fec4f619467..e7559df50e839fa2d4661844a7660e450abedd1f
--- 1/xenial/debian/changelog
--- 2/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@@ -1,7 -1,12 +1,13 @@@
+ ceilometer (2013.2~rc2-2) UNRELEASED; urgency=low
+ 
+   * Added the 2 new services: alarm-evaluator and alarm-notifier.
+ 
+  -- Thomas Goirand <zigo@debian.org>  Mon, 14 Oct 2013 23:52:15 +0800
+ 
  ceilometer (2013.2~rc2-1) experimental; urgency=low
  
    * New upstream pre-release.
 +  * Increased python-keystoneclient (build-)depends to 0.4.0.
  
   -- Thomas Goirand <zigo@debian.org>  Mon, 14 Oct 2013 16:47:55 +0800
  

diff --combined xenial/debian/control
index 42beb8d72cf5c34b3b7dbd728f29a4c317c5c240,3f809c90f1cb5c3c73c5aa0ffc9163419e8b8881..5ad47481b6ac1dfb5526c48f6e54f5ca439a42d8
--- 1/xenial/debian/control
--- 2/xenial/debian/control
+++ b/xenial/debian/control
@@@ -29,7 -29,7 +29,7 @@@ Build-Depends-Indep: alembic (>= 0.4.2)
                       python-happybase,
                       python-httplib2,
                       python-iso8601,
 -                     python-keystoneclient (>= 1:0.3.2),
 +                     python-keystoneclient (>= 1:0.4.0),
                       python-kombu (>> 2.4.7),
                       python-lockfile,
                       python-lxml,
@@@ -84,7 -84,7 +84,7 @@@ Depends: alembic (>= 0.4.2)
           python-glanceclient (>= 1:0.10.0),
           python-greenlet (>= 0.4),
           python-iso8601,
 -         python-keystoneclient (>= 1:0.3.2),
 +         python-keystoneclient (>= 1:0.4.0),
           python-kombu (>> 2.4.7),
           python-lockfile,
           python-lxml,
@@@ -119,6 -119,7 +119,7 @@@ Package: ceilometer-commo
  Architecture: all
  Pre-Depends: dpkg (>= 1.15.6~)
  Depends: adduser,
+          dpkg-dev,
           python-ceilometer (= ${binary:Version}),
           ${misc:Depends},
           ${python:Depends}
@@@ -202,3 -203,37 +203,37 @@@ Description: OpenStack efficient meteri
   overall system.
   .
   This package contains the central agent.
+ 
+ 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 - alarm evaluator
+  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
+  providing all the counters they need to establish customer billing, accros
+  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 alarm evaluator daemon.
+ 
+ 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 - alarm notifier
+  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
+  providing all the counters they need to establish customer billing, accros
+  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 alarm notifier daemon.