Realign packaging with MOS.

Rewritten-From: 5cd9ad58146ecb92c066cac870a41f8f9fbc31b1

diff --git a/trusty/debian/ceilometer-agent-ipmi.init.in b/trusty/debian/ceilometer-agent-ipmi.init.in
index 0c0b9a31570b57862f11caf82d123a9194af984a..d9d90b5054550b92d9e7c9eee1e9b36757ea5aa6 100644 (file)
--- a/trusty/debian/ceilometer-agent-ipmi.init.in
+++ b/trusty/debian/ceilometer-agent-ipmi.init.in
@@ -3,8 +3,8 @@
 # Provides:          ceilometer-agent-ipmi
 # Required-Start:    $network $local_fs $remote_fs $syslog
 # Required-Stop:     $remote_fs
-# Should-Start:      postgresql mysql keystone rabbitmq-server ntp
-# Should-Stop:       postgresql mysql keystone rabbitmq-server ntp
+# Should-Start:      mongodb postgresql mysql keystone rabbitmq-server ntp
+# Should-Stop:       mongodb postgresql mysql keystone rabbitmq-server ntp
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Ceilometer Agent IPMI

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index dd1dc1484abe9b78044c1c0dbce9398754f7048d..ca6b5d1975259882ebc9dfc33e4484911c69cb6e 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (1:5.0.0~b2-2) UNRELEASED; urgency=medium
+
+  * Realign Ceilometer packaging with MOS.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 31 Aug 2015 20:55:14 +0200
+
 ceilometer (1:5.0.0~b2-1) experimental; urgency=medium
 
   * New upstream release.

diff --git a/trusty/debian/control b/trusty/debian/control
index 2a255f800ef53a3a169ad502c0db02736f9c1535..174f96a9c68ecf46709a5fb9246b9b3f7bf48430 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -2,9 +2,7 @@ Source: ceilometer
 Section: web
 Priority: optional
 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>,
+Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
@@ -19,15 +17,15 @@ Build-Depends-Indep: alembic (>= 0.7.2),
                      python-awsauth,
                      python-babel,
                      python-ceilometerclient (>= 1.0.13),
-                     python-coverage,
                      python-contextlib2,
+                     python-coverage,
                      python-croniter,
                      python-elasticsearch (>= 1.3.0),
                      python-eventlet (>= 0.17.4),
                      python-fixtures (>= 1.3.1),
                      python-gabbi (>= 0.12.0),
                      python-glanceclient (>= 1:0.18.0),
-                     python-hacking,
+                     python-hacking (>= 0.9.2),
                      python-happybase,
                      python-httplib2,
                      python-jsonpath-rw,
@@ -35,14 +33,14 @@ Build-Depends-Indep: alembic (>= 0.7.2),
                      python-kafka,
                      python-keystoneclient (>= 1:1.6.0),
                      python-keystonemiddleware (>= 2.0.0),
-                     python-kombu (>= 2.4.8),
+                     python-kombu,
                      python-lxml,
                      python-migrate (>= 0.9.6),
                      python-mock (>= 1.3),
-                     python-msgpack,
+                     python-msgpack (>= 0.4.0),
                      python-mysqldb,
-                     python-neutronclient (>= 2.3.11),
-                     python-novaclient (>= 2:2.22.0),
+                     python-neutronclient (>= 1:2.6.0),
+                     python-novaclient (>= 2:2.26.0),
                      python-oslo.concurrency (>= 2.1.0),
                      python-oslo.config (>= 1:1.11.0),
                      python-oslo.context (>= 0.2.0),
@@ -62,18 +60,18 @@ Build-Depends-Indep: alembic (>= 0.7.2),
                      python-pastedeploy,
                      python-pecan (>= 0.8.0),
                      python-psycopg2,
-                     python-pymongo (>= 3.0.1),
+                     python-pymongo (>= 3.0.2),
                      python-pymysql,
                      python-pysnmp4,
                      python-requests (>= 2.5.2),
                      python-retrying,
                      python-six (>= 1.9.0),
-                     python-sphinxcontrib-docbookrestapi,
-                     python-sphinxcontrib-httpdomain,
+                     python-sphinxcontrib.docbookrestapi,
+                     python-sphinxcontrib.httpdomain,
                      python-sphinxcontrib-pecanwsme,
-                     python-sqlalchemy,
+                     python-sqlalchemy (>= 0.9.6),
                      python-stevedore (>= 1.5.0),
-                     python-swiftclient,
+                     python-swiftclient (>= 1:2.2.0),
                      python-tempest-lib (>= 0.6.1),
                      python-testscenarios,
                      python-testtools (>= 1.4.0),
@@ -99,19 +97,20 @@ Depends: alembic (>= 0.7.2),
          python-croniter,
          python-eventlet (>= 0.17.4),
          python-glanceclient (>= 1:0.18.0),
-         python-greenlet (>= 0.4),
+         python-greenlet,
+         python-happybase,
          python-jsonpath-rw,
          python-jsonschema,
          python-kafka,
          python-keystoneclient (>= 1:1.6.0),
          python-keystonemiddleware (>= 2.0.0),
-         python-kombu (>= 2.4.8),
+         python-kombu,
          python-lxml,
-         python-migrate (>= 0.9.6),
-         python-msgpack,
+         python-migrate (>= 0.9.7),
+         python-msgpack (>= 0.4.0),
          python-mysqldb,
-         python-neutronclient (>= 2.3.11),
-         python-novaclient (>= 2:2.22.0),
+         python-neutronclient (>= 1:2.6.0),
+         python-novaclient (>= 2:2.26.0),
          python-oslo.concurrency (>= 2.1.0),
          python-oslo.config (>= 1:1.11.0),
          python-oslo.context (>= 0.2.0),
@@ -125,8 +124,9 @@ Depends: alembic (>= 0.7.2),
          python-oslo.serialization (>= 1.4.0),
          python-oslo.service,
          python-oslo.utils (>= 1.9.0),
-         python-pbr (>= 1.3),
+         python-oslo.vmware (>= 1.16.0),
          python-pastedeploy,
+         python-pbr (>= 1.3),
          python-pecan (>= 0.8.0),
          python-pymongo,
          python-pymysql,
@@ -134,9 +134,9 @@ Depends: alembic (>= 0.7.2),
          python-requests (>= 2.5.2),
          python-retrying,
          python-six (>= 1.9.0),
-         python-sqlalchemy,
+         python-sqlalchemy (>= 0.9.6),
          python-stevedore (>= 1.5.0),
-         python-swiftclient,
+         python-swiftclient (>= 1:2.2.0),
          python-tooz (>= 0.16.0),
          python-tz,
          python-webob,
@@ -153,6 +153,8 @@ Description: OpenStack efficient metering counters system - Python libraries
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains the Python libraries that are needed for all parts of
  Ceilometer.
 
@@ -163,7 +165,7 @@ Depends: adduser,
          python-ceilometer (= ${binary:Version}),
          ${misc:Depends},
          ${python:Depends},
-Provides: ${python:Provides}
+Provides: ${python:Provides},
 Description: OpenStack efficient metering counters system - common files
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
  providing all the counters they need to establish customer billing, across
@@ -172,6 +174,8 @@ Description: OpenStack efficient metering counters system - common files
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains files that are needed for all parts of Ceilometer.
 
 Package: ceilometer-collector
@@ -180,6 +184,7 @@ Depends: ceilometer-common (= ${binary:Version}),
          ${misc:Depends},
          ${ostack-lsb-base},
          ${python:Depends},
+Suggests: mongodb,
 Description: OpenStack efficient metering counters system - collector service
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
  providing all the counters they need to establish customer billing, across
@@ -188,16 +193,17 @@ Description: OpenStack efficient metering counters system - collector service
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  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
+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
@@ -206,6 +212,8 @@ Description: OpenStack efficient metering counters system - polling service
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains the polling service.
 
 Package: ceilometer-api
@@ -216,6 +224,7 @@ Depends: adduser,
          ${misc:Depends},
          ${ostack-lsb-base},
          ${python:Depends},
+Suggests: mongodb,
 Description: OpenStack efficient metering counters system (API service)
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
  providing all the counters they need to establish customer billing, across
@@ -224,6 +233,8 @@ Description: OpenStack efficient metering counters system (API service)
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains the API service.
 
 Package: ceilometer-agent-compute
@@ -240,6 +251,8 @@ Description: OpenStack efficient metering counters system - compute agent
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains the compute agent.
 
 Package: ceilometer-agent-central
@@ -256,11 +269,14 @@ Description: OpenStack efficient metering counters system - central agent
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains the central agent.
 
 Package: ceilometer-agent-ipmi
 Architecture: all
 Depends: ceilometer-common (= ${binary:Version}),
+         ipmitool,
          ${misc:Depends},
          ${ostack-lsb-base},
          ${python:Depends},
@@ -272,6 +288,8 @@ Description: OpenStack efficient metering counters system - IPMI agent
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains the IPMI agent daemon.
 
 Package: ceilometer-agent-notification
@@ -280,7 +298,7 @@ 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 - notification 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
@@ -288,6 +306,8 @@ Description: OpenStack efficient metering counters system - agent notification
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains the notification agent daemon.
 
 Package: ceilometer-alarm-evaluator
@@ -304,6 +324,8 @@ Description: OpenStack efficient metering counters system - alarm evaluator
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains the alarm evaluator daemon.
 
 Package: ceilometer-alarm-notifier
@@ -320,6 +342,8 @@ Description: OpenStack efficient metering counters system - alarm notifier
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains the alarm notifier daemon.
 
 Package: ceilometer-doc
@@ -335,4 +359,6 @@ Description: OpenStack efficient metering counters system - doc
  projects, and agents doing data collections should be independent of the
  overall system.
  .
+ (A ceilometer is an instrument that measures cloud coverage.)
+ .
  This package contains the documentation.

diff --git a/trusty/debian/copyright b/trusty/debian/copyright
index 86502996461ae1c8f411835d05a1cc7effb2ac65..3502f1953f475c8f8bb271cfd689dd1444cab0cd 100644 (file)
--- a/trusty/debian/copyright
+++ b/trusty/debian/copyright
@@ -1,11 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ceilometer
-Upstream-Contact: Julien Danjou <acid@debian.org>,
 Source: https://github.com/stackforge/ceilometer
 
 Files: debian/*
-Copyright: 2012 Thomas Goirand <zigo@debian.org>
-License: Apache-2
+Copyright: 2012-2015, Canonical Ltd
+           2012-2015, Thomas Goirand <zigo@debian.org>
+License: Apache-2.0
 
 Files: *
 Copyright: 2012 New Dream Network, LLC (DreamHost)
@@ -15,9 +15,10 @@ Copyright: 2012 New Dream Network, LLC (DreamHost)
            2011 Cloudscaling Group, Inc
            2011 OpenStack LLC.
            2012 Nicolas Barcet for Canonical
-License: Apache-2
+           2012-2015, OpenStack Foundation
+License: Apache-2.0
 
-License: Apache-2
+License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
  You may obtain a copy of the License at

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 94822756c5c88f21275f6d00faf2bbde67e3b49e..8f70cd7577029e4c42240790d5eb5d722771e48a 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
+export HOME="$(CURDIR)/debian/test"
 include /usr/share/openstack-pkg-tools/pkgos.make
-
-export OSLO_PACKAGE_VERSION=$(VERSION)
+export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1)
 
 %:
        dh $@  --with python2,systemd,sphinxdoc
@@ -12,7 +10,6 @@ export OSLO_PACKAGE_VERSION=$(VERSION)
 override_dh_clean:
        dh_clean
        rm -rf .testrepository
-       rm -rf ceilometer.egg-info
        rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
 
 override_dh_install:
@@ -39,9 +36,9 @@ override_dh_auto_build:
 
 override_dh_auto_clean:
        dh_auto_clean
-       rm -rf debian/*.upstart
-       rm -rf debian/ceilometer-common.postinst
+       rm -rf .testrepository
        find . -iname '*.pyc' -delete
+       rm -f debian/*.init debian/*.service debian/*.upstart
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))