Merge lp:~zulcss/ceilometer/deps-fixes into lp:~openstack-ubuntu-testing/ceilometer/grizzly

[Chuck Short]

Dependency clean up and update.

[Adam Gandelman (gandelman-a)]

Don't think this will work. In ceilometer-common.postinst, the call to adduser with '--ingroup ceilometer,nova' will fail in cases where the nova group doesn't exist. Looking at the nova package, this group gets created by the nova-common package, but the only nova dependency ceilometer has is on python-nova.

review: Needs Fixing

Unmerged revisions

5. By Chuck Short on 2012-12-05

debian/control: Add python-pymongo dep.

4. By Chuck Short on 2012-12-04

debian/control: Drop python-ming not needed

3. By Chuck Short on 2012-12-04

debian/control: Clean up and update pythhon-dependencies

2. By Chuck Short on 2012-11-22

* debian/ceilometer-common.postinst: Add ceilometer to the user group
  so that it can read its configuration files.
* debian/watch: Added watch file.

=== modified file 'debian/ceilometer-common.postinst'
--- debian/ceilometer-common.postinst	2012-11-22 18:55:57 +0000
+++ debian/ceilometer-common.postinst	2012-12-05 19:07:41 +0000
@@ -6,7 +6,7 @@
 	fi
 
 	if ! getenv passwd ceilometer > /dev/null 2>&1; then
-		adduser --system --home /var/lib/ceilometer --ingroup ceilometer --no-create-home \
+		adduser --system --home /var/lib/ceilometer --ingroup ceilometer,nova --no-create-home \
 			--shell /bin/false ceilometer
 	fi
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-22 18:55:57 +0000
+++ debian/changelog	2012-12-05 19:07:41 +0000
@@ -1,3 +1,14 @@
+ceilometer (0.1-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/ceilometer-common.postinst: Add ceilometer to the user group 
+    so that it can read its configuration files. 
+  * debian/watch: Added watch file.
+  * debian/control: Clean up and update pythhon-dependencies
+  * debian/control: Drop python-ming not needed
+  * debian/control: Add python-pymongo dep.
+
+ -- Chuck Short <[e-mail]>  Thu, 22 Nov 2012 13:01:04 -0600
+
 ceilometer (0.1-0ubuntu1) quantal; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2012-11-22 18:55:57 +0000
+++ debian/control	2012-12-05 19:07:41 +0000
@@ -6,41 +6,44 @@
  python-all (>= 2.6),
  python-all-dev (>=  2.6.6-3~)
 Build-Depends-Indep:
- python-webob,
- python-kombu,
+ python-anyjson, 
+ python-eventlet,  
+ python-flask (>= 0.9),
+ python-glance,
+ python-glanceclient (>= 1:0.6),
+ python-iso8601,
+ python-keystoneclient (>= 1:0.2),
+ python-kombu,  
  python-lockfile,
- python-netaddr,
- python-sqlalchemy,
- python-eventlet,
- python-anyjson,
- python-flask,
- python-stevedore,
+ python-mock,
+ python-mox,   
+ python-netaddr,  
  python-nose,
- pep8,
- python-ming,
- python-mock,
- python-mox,
- python-glanceclient,
- python-nova,
- python-glance,
+ python-nova (>= 2012.2),
+ python-pymongo,
  python-setuptools-git,
- python-iso8601
+ python-sqlalchemy,
+ python-stevedore (>= 0.6),
+ python-webob
 Standards-Version: 3.9.3
 
 Package: python-ceilometer
 Architecture: all
-Depends: ${python:Depends},
- python-webob,
+Depends: ${python:Depends}, ${misc:Depends},
+ python-anyjson,
+ python-eventlet,
+ python-flask (>= 0.9),
+ python-glanceclient (>= 1:0.6),
+ python-greenlet (>= 0.4),
+ python-keystoneclient (>= 1:0.2),
+ python-iso8601,
  python-kombu,
- python-iso8601,
  python-lockfile,
- python-netaddr,
- python-sqlalchemy,
- python-eventlet,
- python-anyjson,
- python-flask,
- python-stevedore,
- ${misc:Depends}
+ python-nova (>= 2012.2),
+ python-novaclient (>= 2:2.6.10),
+ python-netaddr, 
+ python-stevedore (>= 0.6),
+ python-webob
 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 

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2012-12-05 19:07:41 +0000
@@ -0,0 +1,3 @@
+version=3
+opts="uversionmangle=s/%7E/~/" https://launchpad.net/ceiolmeter/+download https://launchpad.net/ceilometer/.*/.*/.*/ceilometer-(.*)\.tar\.gz
+http://tarballs.openstack.org/ceilometer/ ceilometer-(\d.*).tar.gz