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

Proposed by Adam Gandelman
Status: Needs review
Proposed branch: lp:~gandelman-a/glance/899970
Merge into: lp:~openstack-ubuntu-packagers/glance/ubuntu
Diff against target: 35 lines (+16/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+9/-1)
To merge this branch: bzr merge lp:~gandelman-a/glance/899970
Reviewer Review Type Date Requested Status
OpenStack Ubuntu packagers Pending
Review via email: mp+84511@code.launchpad.net
To post a comment you must log in.
lp:~gandelman-a/glance/899970 updated
74. By Adam Gandelman

Sort dependencies added to glance

Unmerged revisions

74. By Adam Gandelman

Sort dependencies added to glance

73. By Adam Gandelman

debian/control: Add dependencies previously removed from python-glance
to glance package where they are actually required. (LP: #899970)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-11-16 06:10:14 +0000
3+++ debian/changelog 2011-12-07 19:15:27 +0000
4@@ -1,3 +1,10 @@
5+glance (2012.1~e1~20110919.1021-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/control: Add dependencies previously removed from python-glance
8+ to glance package where they are actually required. (LP: #899970)
9+
10+ -- Adam Gandelman <adamg@canonical.com> Mon, 05 Dec 2011 09:43:32 -0800
11+
12 glance (2012.1~e1~20110919.1021-0ubuntu1) natty; urgency=low
13
14 * New upstream release
15
16=== modified file 'debian/control'
17--- debian/control 2011-11-15 18:09:22 +0000
18+++ debian/control 2011-12-07 19:15:27 +0000
19@@ -53,7 +53,15 @@
20 Package: glance
21 Architecture: all
22 Section: python
23-Depends: ${python:Depends}, ${misc:Depends}, python-glance (= ${source:Version}), adduser
24+Depends: ${python:Depends}, ${misc:Depends},
25+ adduser
26+ python-crypto,
27+ python-eventlet,
28+ python-glance (= ${source:Version}),
29+ python-migrate,
30+ python-routes,
31+ python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
32+ python-xattr,
33 Description: OpenStack Image Registry and Delivery Service - Daemons
34 The Glance project provides an image registration, discovery and
35 delivery service. These services may be used as stand-along services, and

Subscribers

People subscribed via source and target branches