Merge lp:~gandelman-a/glance/fixdeps into lp:~openstack-ubuntu-packagers/glance/ubuntu

[Adam Gandelman]

Fixes some dependency issues for the api and registry servers that were caused by a previous Depends cleanup of the client package.

[Chuck Short (zulcss)]

lgtm

[Chuck Short (zulcss)]

review: Approve

[Jay Pipes (jaypipes)]

I deliberately removed the need for things like eventlet from the glance-common package because we didn't want the python-glance package (the client package) having to depend on things like eventlet. Does this patch mean that the python-glance package now requires those packages again?

[Adam Gandelman (gandelman-a)]

The dependencies were removed from the client / python-glance package (on which the old all-in-one glance server package depended upon) There was no glance-common package at the time. Now that api and registry live in their own respective packages, they both depend on glance-common to resolve dependencies like this. python-glance has no dependency on glance-common and is installable without.

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-08 18:29:33 +0000
+++ debian/changelog	2011-12-15 06:26:25 +0000
@@ -10,6 +10,8 @@
 
   [ Adam Gandelman ]
   * Only remove user/group in .postrm if they exist. (LP: #857021)
+  * Add dependencies previously removed from client package to glance-common,
+    where they are required for glance-{api,registry}
 
  -- Scott Moser <[e-mail]>  Wed, 07 Dec 2011 14:10:28 -0500
 

=== modified file 'debian/control'
--- debian/control	2011-12-10 12:52:14 +0000
+++ debian/control	2011-12-15 06:26:25 +0000
@@ -53,7 +53,14 @@
 Package: glance-common
 Architecture: all
 Section: python
-Depends: ${python:Depends}, ${misc:Depends}, python-glance (= ${source:Version}), adduser
+Depends: ${python:Depends}, ${misc:Depends},
+    adduser,
+    python-eventlet,
+    python-glance (= ${source:Version}),
+    python-migrate,
+    python-routes,
+    python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
+    python-xattr
 Description: OpenStack Image Registry and Delivery Service - Common
  The Glance project provides an image registration, discovery and 
  delivery service. These services may be used as stand-along services, and