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
=== modified file 'debian/changelog'
--- debian/changelog 2011-11-16 06:10:14 +0000
+++ debian/changelog 2011-12-07 19:15:27 +0000
@@ -1,3 +1,10 @@
1glance (2012.1~e1~20110919.1021-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/control: Add dependencies previously removed from python-glance
4 to glance package where they are actually required. (LP: #899970)
5
6 -- Adam Gandelman <adamg@canonical.com> Mon, 05 Dec 2011 09:43:32 -0800
7
1glance (2012.1~e1~20110919.1021-0ubuntu1) natty; urgency=low8glance (2012.1~e1~20110919.1021-0ubuntu1) natty; urgency=low
29
3 * New upstream release10 * New upstream release
411
=== modified file 'debian/control'
--- debian/control 2011-11-15 18:09:22 +0000
+++ debian/control 2011-12-07 19:15:27 +0000
@@ -53,7 +53,15 @@
53Package: glance53Package: glance
54Architecture: all54Architecture: all
55Section: python55Section: python
56Depends: ${python:Depends}, ${misc:Depends}, python-glance (= ${source:Version}), adduser56Depends: ${python:Depends}, ${misc:Depends},
57 adduser
58 python-crypto,
59 python-eventlet,
60 python-glance (= ${source:Version}),
61 python-migrate,
62 python-routes,
63 python-sqlalchemy-ext | python-sqlalchemy (<< 0.6.3-2),
64 python-xattr,
57Description: OpenStack Image Registry and Delivery Service - Daemons65Description: OpenStack Image Registry and Delivery Service - Daemons
58 The Glance project provides an image registration, discovery and 66 The Glance project provides an image registration, discovery and
59 delivery service. These services may be used as stand-along services, and67 delivery service. These services may be used as stand-along services, and

Subscribers

People subscribed via source and target branches