Merge lp:~zulcss/ceilometer/ceilometer-fbfs-jun17 into lp:~ubuntu-server-dev/ceilometer/havana

[Chuck Short]

[James Page (james-page)]

Merged and pushed.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-05 09:47:36 +0000
+++ debian/changelog	2013-06-19 13:57:35 +0000
@@ -1,7 +1,16 @@
-ceilometer (2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
+ceilometer (2013.2.a76.g1d13c31-0ubuntu1) UNRELEASED; urgency=low
 
+  [ Yolanda Robla ]
   * debian/patches/default-dbconnection-sqlite.patch: updated db section
 
+  [ Chuck Short ]
+  * New upstream version.
+  * debian/control: Suggest python-happybase.
+  * debian/patches/default-dbconnection-sqlite.patch: Refreshed.
+  * debian/control: Bump requirements for stevedore to 0.9.
+  * debian/patches/fix-setup-requirements.patch: Drop happybase requirements.
+  * debian/control: Add python-simplejson
+
  -- Yolanda Robla <[e-mail]>  Wed, 05 Jun 2013 11:46:29 +0200
 
 ceilometer (2013.2~b1-0ubuntu1) saucy; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-05-28 11:37:17 +0000
+++ debian/control	2013-06-19 13:57:35 +0000
@@ -16,7 +16,6 @@
  python-fixtures,
  python-flask (>= 0.9),
  python-glanceclient,
- python-happybase,
  python-iso8601,
  python-keystoneclient (<< 1:0.3),
  python-kombu,
@@ -35,9 +34,10 @@
  python-pymongo (>= 2.2),
  python-requests,
  python-setuptools-git (>= 0.4),
+ python-simplejson,
  python-sphinx,
  python-sqlalchemy,
- python-stevedore (>= 0.6),
+ python-stevedore (>= 0.9),
  python-swift,
  python-swiftclient,
  python-testtools,
@@ -52,6 +52,7 @@
 Package: python-ceilometer
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
+Suggests: python-happybase
 Description: ceilometer python libraries
  Ceilometer aims to deliver a unique point of contact for billing systems to
  aquire all counters they need to establish  customer billing, accross all

=== modified file 'debian/patches/default-dbconnection-sqlite.patch'
--- debian/patches/default-dbconnection-sqlite.patch	2013-06-05 09:47:36 +0000
+++ debian/patches/default-dbconnection-sqlite.patch	2013-06-19 13:57:35 +0000
@@ -1,12 +1,12 @@
-Index: ceilometer/etc/ceilometer/ceilometer.conf.sample
-===================================================================
---- a/etc/ceilometer/ceilometer.conf.sample   2013-06-04 17:46:52.000000000 +0000
-+++ b/etc/ceilometer/ceilometer.conf.sample        2013-06-05 09:36:45.074895860 +0000
-@@ -517,6 +517,7 @@
- # The SQLAlchemy connection string used to connect to the
- # database (string value)
- #connection=sqlite:////common/db/$sqlite_db
-+connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
- 
- # timeout before idle sql connections are reaped (integer
- # value)
+diff -Naurp ceilometer-2013.2.a76.g1d13c31.orig/etc/ceilometer/ceilometer.conf.sample ceilometer-2013.2.a76.g1d13c31/etc/ceilometer/ceilometer.conf.sample
+--- ceilometer-2013.2.a76.g1d13c31.orig/etc/ceilometer/ceilometer.conf.sample	2013-06-17 07:37:03.000000000 -0500
++++ ceilometer-2013.2.a76.g1d13c31/etc/ceilometer/ceilometer.conf.sample	2013-06-17 07:48:41.024448351 -0500
+@@ -88,7 +88,7 @@
+ #
+ 
+ # the filename to use with sqlite (string value)
+-#sqlite_db=ceilometer.sqlite
++sqlite_db=sqlite:////var/lib/ceilometer/ceilometer.sqlite
+ 
+ # If true, use synchronous mode for sqlite (boolean value)
+ #sqlite_synchronous=true

=== added file 'debian/patches/fix-setup-requirements.patch'
--- debian/patches/fix-setup-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-setup-requirements.patch	2013-06-19 13:57:35 +0000
@@ -0,0 +1,8 @@
+diff -Naurp ceilometer-2013.2.a76.g1d13c31.orig/requirements.txt ceilometer-2013.2.a76.g1d13c31/requirements.txt
+--- ceilometer-2013.2.a76.g1d13c31.orig/requirements.txt	2013-06-17 07:37:03.000000000 -0500
++++ ceilometer-2013.2.a76.g1d13c31/requirements.txt	2013-06-17 08:59:55.100450424 -0500
+@@ -22,4 +22,3 @@ requests>=1.1,<1.2.1
+ wsme>=0.5b2
+ pyyaml
+ oslo.config>=1.1.0
+-happybase>=0.4

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-05-21 14:28:17 +0000
+++ debian/patches/series	2013-06-19 13:57:35 +0000
@@ -1,1 +1,2 @@
 default-dbconnection-sqlite.patch
+fix-setup-requirements.patch

=== modified file 'debian/pydist-overrides'
--- debian/pydist-overrides	2013-02-01 16:10:18 +0000
+++ debian/pydist-overrides	2013-06-19 13:57:35 +0000
@@ -1,1 +1,2 @@
 pymongo python-pymongo
+happybase