Merge lp:~zulcss/ceilometer/ceilometer-pbr into lp:~openstack-ubuntu-testing/ceilometer/havana

[Chuck Short]

[Yolanda Robla (yolanda.robla)]

Missing python-testtools in changelog

review: Needs Fixing

[lp:~zulcss/ceilometer/ceilometer-pbr]

29. By Chuck Short on 2013-05-21

debian/control: Add python-testtools

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-05 19:34:40 +0000
+++ debian/changelog	2013-05-21 14:47:29 +0000
@@ -1,3 +1,19 @@
+ceilometer (2013.2.a151.geaa6b33-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/rules: Add fail-missing if binaries are missing 
+    from the packages.
+  * debian/control: Add python-happybase as build-dependencies.
+  * debian/control: Add python-pbr and python-d2to1 as build-dependencies
+  * debian/control: Add python-fixtures as build-dependencies.
+  * debian/control: Add python-nova as build-dependencies.
+  * debian/control: Add python-testtools
+  * debian/patches/requests-dep.patch: Dropped no longer needed.
+  * debian/patches/remove-hbase-support.patch: Dropped no longer neded.
+  * debian/patches/default-dbconnection-sqlite.patch: Refreshed.
+
+ -- Chuck Short <[e-mail]>  Tue, 21 May 2013 07:49:01 -0500
+
 ceilometer (2013.1-0ubuntu1) raring; urgency=low
 
   * New upstream release. 

=== modified file 'debian/control'
--- debian/control	2013-03-12 14:10:35 +0000
+++ debian/control	2013-05-21 14:47:29 +0000
@@ -5,16 +5,18 @@
 Build-Depends:
  debhelper (>= 8.0.0),
  python-all (>= 2.6),
- python-nose,
  python-anyjson (>= 0.2.4),
  python-argparse,
  python-babel (>= 0.9.6),
  python-coverage,
+ python-d2to1,
  python-docutils,
  python-eventlet,
  python-extras,
+ python-fixtures,
  python-flask (>= 0.9),
  python-glanceclient,
+ python-happybase,
  python-iso8601,
  python-keystoneclient (<< 1:0.3),
  python-kombu,
@@ -25,8 +27,11 @@
  python-mox,
  python-netaddr,
  python-netifaces,
+ python-nose,
+ python-nova,
  python-novaclient (>= 2.6.10),
  python-oslo.config,
+ python-pbr,
  python-pecan (>= 0.2.0),
  python-pymongo (>= 2.2),
  python-requests,
@@ -36,6 +41,7 @@
  python-stevedore (>= 0.6),
  python-swift,
  python-swiftclient,
+ python-testtools,
  python-unittest2,
  python-webob (>= 1.2),
  python-wsme (>= 0.5b1),

=== modified file 'debian/patches/default-dbconnection-sqlite.patch'
--- debian/patches/default-dbconnection-sqlite.patch	2013-03-21 16:49:24 +0000
+++ debian/patches/default-dbconnection-sqlite.patch	2013-05-21 14:47:29 +0000
@@ -1,11 +1,11 @@
---- a/etc/ceilometer/ceilometer.conf.sample
-+++ b/etc/ceilometer/ceilometer.conf.sample
-@@ -262,7 +262,7 @@
- 
- ######## defined in ceilometer.storage ########
- 
--# database_connection=mongodb://localhost:27017/ceilometer
+diff -Naurp ceilometer-2013.2.a151.geaa6b33.orig/etc/ceilometer/ceilometer.conf.sample ceilometer-2013.2.a151.geaa6b33/etc/ceilometer/ceilometer.conf.sample
+--- ceilometer-2013.2.a151.geaa6b33.orig/etc/ceilometer/ceilometer.conf.sample	2013-05-21 07:45:54.000000000 -0500
++++ ceilometer-2013.2.a151.geaa6b33/etc/ceilometer/ceilometer.conf.sample	2013-05-21 08:00:43.786560523 -0500
+@@ -405,6 +405,7 @@
+ 
+ # Database connection string (string value)
+ #database_connection=mongodb://localhost:27017/ceilometer
 +database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
- #### (StrOpt) Database connection string
- 
- 
+ 
+ 
+ ######## defined in ceilometer.storage.sqlalchemy.models ########

=== removed file 'debian/patches/remove-hbase-support.patch'
--- debian/patches/remove-hbase-support.patch	2013-03-21 16:49:24 +0000
+++ debian/patches/remove-hbase-support.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-Description: Drop unpackaged happybase from dependencies
- This avoids breaking stevedore extensions via endpoints.
-Author: James Page <[e-mail]>
-Forwarded: not-needed
-
---- a/tools/pip-requires
-+++ b/tools/pip-requires
-@@ -20,4 +20,3 @@ extras
- wsme>=0.5b1
- pyyaml
- oslo.config>=1.1.0
--happybase>=0.4

=== removed file 'debian/patches/requests-dep.patch'
--- debian/patches/requests-dep.patch	2013-03-21 16:49:24 +0000
+++ debian/patches/requests-dep.patch	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-Description: Remove upper bound on requests
-Author: James Page <[e-mail]>
-Forwarded: no
-
---- a/tools/pip-requires
-+++ b/tools/pip-requires
-@@ -15,7 +15,7 @@ python-novaclient>=2.6.10
- python-keystoneclient>=0.2.3
- python-swiftclient
- lxml
--requests<1.0
-+requests
- extras
- wsme>=0.5b1
- pyyaml

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-12 15:01:59 +0000
+++ debian/patches/series	2013-05-21 14:47:29 +0000
@@ -1,3 +1,1 @@
-remove-hbase-support.patch
-requests-dep.patch
 default-dbconnection-sqlite.patch

=== modified file 'debian/rules'
--- debian/rules	2013-03-11 22:42:51 +0000
+++ debian/rules	2013-05-21 14:47:29 +0000
@@ -19,7 +19,7 @@
 
 override_dh_install:
 	cp etc/ceilometer/ceilometer.conf.sample etc/ceilometer/ceilometer.conf
-	dh_install
+	dh_install --fail-missing
 
 override_dh_auto_clean:
 	rm -f etc/ceilometer/ceilometer.conf