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 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Ubuntu packagers | Pending | ||
Review via email:
|
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.
Unmerged revisions
- 30. By Mark Washenberger
-
try out python-
pysqlite2- -will it override python:Depends? - 29. By Mark Washenberger
-
remove python-sqlite dependency
Apparently this doesn't work--trying again