Merge lp:~sorrison/glance/dependancy-fixes into lp:~openstack-ubuntu-testing/glance/precise-folsom-proposed

Proposed by Sam Morrison
Status: Merged
Merge reported by: Chuck Short
Merged at revision: not available
Proposed branch: lp:~sorrison/glance/dependancy-fixes
Merge into: lp:~openstack-ubuntu-testing/glance/precise-folsom-proposed
Diff against target: 51 lines (+9/-16)
1 file modified
debian/control (+9/-16)
To merge this branch: bzr merge lp:~sorrison/glance/dependancy-fixes
Reviewer Review Type Date Requested Status
Chuck Short Pending
Review via email: mp+126583@code.launchpad.net

Description of the change

I've moved most of the python dependencies into python-glance as that is where they're actually needed.

Changed the glance package to now only depend on glance-api and glance-registry. It had some python dependencies that should've been in python-glance.
Also in glance-common there were python dependencies that should be in python-glance.

To post a comment you must log in.
Revision history for this message
Sam Morrison (sorrison) wrote :

Also linked to closed bug https://bugs.launchpad.net/ubuntu/quantal/+source/glance/+bug/1030152 which should be reopened.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2012-09-17 14:37:26 +0000
3+++ debian/control 2012-09-27 01:04:22 +0000
4@@ -53,7 +53,13 @@
5 python-requests,
6 python-keystone,
7 python-swiftclient,
8- python-crypto
9+ python-crypto,
10+ python-jsonschema,
11+ python-migrate,
12+ python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
13+ python-routes,
14+ python-eventlet,
15+ python-setuptools
16 Provides: ${python:Provides}
17 XB-Python-Version: ${python:Versions}
18 Description: OpenStack Image Registry and Delivery Service - Python library
19@@ -68,17 +74,8 @@
20 Architecture: all
21 Section: python
22 Depends: ${python:Depends}, ${misc:Depends},
23- python-glance (= ${source:Version}),
24- python-routes,
25- python-eventlet,
26- python-migrate,
27- python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
28- python-crypto,
29 glance-api (= ${source:Version}),
30- glance-registry (= ${source:Version}),
31- ca-certificates,
32- python-jsonschema,
33- adduser
34+ glance-registry (= ${source:Version})
35 Suggests: ceph-common
36 Description: OpenStack Image Registry and Delivery Service - Daemons
37 The Glance project provides an image registration and discovery service
38@@ -104,12 +101,8 @@
39 Architecture: all
40 Section: python
41 Depends: ${python:Depends}, ${misc:Depends},
42- python-eventlet,
43 python-glance (= ${source:Version}),
44- python-migrate,
45- python-routes,
46- python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
47- python-xattr,
48+ ca-certificates,
49 adduser
50 Breaks: glance ( <= 2011.3-0ubuntu4.1 )
51 Replaces: glance ( <= 2011.3-0ubuntu4.1 )

Subscribers

People subscribed via source and target branches