OpenStack Identity (keystone)

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

  1. ubuntu
  2. Merge into ubuntu
Proposed by Mark Washenberger
Status: Work in progress
Proposed branch: lp:~markwash/keystone/ubuntu
Merge into: lp:~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:~markwash/keystone/ubuntu
Reviewer Review Type Date Requested Status
OpenStack Ubuntu packagers Pending
Review via email: mp+84010@code.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

Reply
lp:~markwash/keystone/ubuntu updated
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
1=== modified file 'debian/control'
2--- debian/control 2011-11-22 16:46:03 +0000
3+++ debian/control 2011-12-01 15:15:29 +0000
4@@ -42,9 +42,9 @@
5 python-paste,
6 python-pastedeploy,
7 python-pastescript,
8+ python-pysqlite2,
9 python-webob,
10 python-sqlalchemy,
11- python-sqlite,
12 Provides: ${python:Provides}
13 XB-Python-Version: ${python:Versions}
14 Description: Proposed OpenStack identity service - Python library

Subscribers

People subscribed via source and target branches