Merge lp://staging/~markwash/keystone/ubuntu into lp://staging/~openstack-ubuntu-packagers/keystone/ubuntu

Proposed by Mark Washenberger
Status: Work in progress
Proposed branch: lp://staging/~markwash/keystone/ubuntu
Merge into: lp://staging/~openstack-ubuntu-packagers/keystone/ubuntu
Diff against target: 14 lines (+1/-1)
1 file modified
debian/control (+1/-1)
To merge this branch: bzr merge lp://staging/~markwash/keystone/ubuntu
Reviewer Review Type Date Requested Status
OpenStack Ubuntu packagers Pending
Review via email: mp+84010@code.staging.launchpad.net

Description of the change

I am not presently able to test this, but it looks like it should fix the conflicting dependencies on both python-pysqlite1.1 and python-sqlite.

To post a comment you must log in.
Revision history for this message
Mark Washenberger (markwash) wrote :

Apparently this doesn't work--trying again

30. By Mark Washenberger

try out python-pysqlite2--will it override python:Depends?

Unmerged revisions

30. By Mark Washenberger

try out python-pysqlite2--will it override python:Depends?

29. By Mark Washenberger

remove python-sqlite dependency

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches