Canonical SSO provider

Merge lp:~ricardokirkner/canonical-identity-provider/dependencies-update-with-pytz into lp:~canonical-isd-hackers/canonical-identity-provider/dependencies

  1. dependencies-update-with-pytz
  2. Merge into dependencies
Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: no longer in the source branch.
Merged at revision: 41
Proposed branch: lp:~ricardokirkner/canonical-identity-provider/dependencies-update-with-pytz
Merge into: lp:~canonical-isd-hackers/canonical-identity-provider/dependencies
Diff against target: 43 lines (+13/-2)
3 files modified
Makefile (+3/-0)
debian/changelog (+7/-0)
debian/control (+3/-2)
To merge this branch: bzr merge lp:~ricardokirkner/canonical-identity-provider/dependencies-update-with-pytz
Reviewer Review Type Date Requested Status
Ricardo Kirkner (community) Approve
Review via email: mp+154521@code.launchpad.net

Commit message

updated meta-package to track new python-tz dependency

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'Makefile'
2--- Makefile 1970-01-01 00:00:00 +0000
3+++ Makefile 2013-03-20 20:47:26 +0000
4@@ -0,0 +1,3 @@
5+build:
6+ dpkg-buildpackage -S -I.bzr -I.env
7+
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2013-02-08 16:28:24 +0000
11+++ debian/changelog 2013-03-20 20:47:26 +0000
12@@ -1,3 +1,10 @@
13+canonical-identity-provider-dependencies (13.02.20) lucid; urgency=low
14+
15+ * Added python-tz as a dependency (required by python-oops, which is tracked
16+ as sourcedep)
17+
18+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 20 Mar 2013 17:29:19 -0300
19+
20 canonical-identity-provider-dependencies (13.02.08) lucid; urgency=low
21
22 * Bumped version for dependency django-oauth-backend to 0.2.3.
23
24=== modified file 'debian/control'
25--- debian/control 2013-03-04 17:12:00 +0000
26+++ debian/control 2013-03-20 20:47:26 +0000
27@@ -28,13 +28,14 @@
28 python-statsd (> 1.0.0-0ubuntu1~), python-statsd (<= 1.0.0-0ubuntu1),
29 python-wsgi-oops (>= 0.1~bzr60-1),
30 # sso specific
31- python-django-oauth-backend (> 0.2.3~), python-django-oauth-backend (<= 0.2.3),
32 python-memcache,
33 python-django-saml2-idp (> 0.18-0ubuntu2~), python-django-saml2-idp (<= 0.18-0ubuntu2),
34 python-m2crypto,
35 python-oath (> 1.0-0~36~), python-oath (<= 1.0-0~36),
36 python-raven (> 1.4.6~), python-raven (<= 1.4.6),
37- python-simplejson
38+ python-simplejson,
39+# required for python-oops (sourcedep)
40+ python-tz
41 Description: Meta-package for Canonical OpenID provider web dependencies
42
43 Package: canonical-identity-provider-database-dependencies

Subscribers

People subscribed via source and target branches