Merge lp:~ricardokirkner/canonical-identity-provider/dependencies-precise into lp:~canonical-isd-hackers/canonical-identity-provider/dependencies

Proposed by Ricardo Kirkner
Status: Merged
Approved by: Ricardo Kirkner
Approved revision: no longer in the source branch.
Merged at revision: 46
Proposed branch: lp:~ricardokirkner/canonical-identity-provider/dependencies-precise
Merge into: lp:~canonical-isd-hackers/canonical-identity-provider/dependencies
Diff against target: 116 lines (+55/-26)
3 files modified
Makefile (+3/-1)
debian/changelog (+20/-0)
debian/control (+32/-25)
To merge this branch: bzr merge lp:~ricardokirkner/canonical-identity-provider/dependencies-precise
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+171418@code.launchpad.net

Commit message

simplified dependency meta-packages and targetted them at precise

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Are we installing postgresql somewhere?

Otherwise, looks good!

review: Approve
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

> Are we installing postgresql somewhere?
>

in the prod deps of course not. in the dev deps, it gets brought in by postgresql-plpython

> Otherwise, looks good!

Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

As of rev. 49, this includes all known dependencies for getting tests (both unit tests and acceptance tests) passing.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2013-03-20 20:43:33 +0000
3+++ Makefile 2013-06-27 00:05:29 +0000
4@@ -1,3 +1,5 @@
5-build:
6+source:
7 dpkg-buildpackage -S -I.bzr -I.env
8
9+binary:
10+ dpkg-buildpackage -I.bzr -I.env
11
12=== modified file 'debian/changelog'
13--- debian/changelog 2013-05-22 14:04:51 +0000
14+++ debian/changelog 2013-06-27 00:05:29 +0000
15@@ -1,3 +1,23 @@
16+canonical-identity-provider-dependencies (13.06.26-1) precise; urgency=low
17+
18+ * added missing dependency
19+
20+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 26 Jun 2013 21:02:16 -0300
21+
22+canonical-identity-provider-dependencies (13.06.26) precise; urgency=low
23+
24+ * added missing developer dependencies for acceptance tests
25+
26+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 26 Jun 2013 18:31:53 -0300
27+
28+canonical-identity-provider-dependencies (13.06.25) precise; urgency=low
29+
30+ * Moved main target to precise
31+ * Removed any non-packaged dependencies
32+ * Added developer dependencies meta-package
33+
34+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 25 Jun 2013 17:37:16 -0300
35+
36 canonical-identity-provider-dependencies (13.05.22) lucid; urgency=low
37
38 * Pinned python-amqlib to > 1.0.2ubuntu0~
39
40=== modified file 'debian/control'
41--- debian/control 2013-05-22 14:04:51 +0000
42+++ debian/control 2013-06-27 00:05:29 +0000
43@@ -1,41 +1,48 @@
44 Source: canonical-identity-provider-dependencies
45 Section: misc
46 Priority: extra
47-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7)
48+Build-Depends: cdbs, debhelper
49 Maintainer: Ricardo Kirkner <ricardo.kirkner@canonical.com>
50 Standards-Version: 3.8.3
51
52-Package: canonical-identity-provider-web-dependencies
53+Package: canonical-identity-provider-dependencies
54 Architecture: all
55 Depends:
56-# isd common
57 libapache2-mod-wsgi,
58- python-django,
59- python-django-adminaudit (> 0.3.3-1~), python-django-adminaudit (<= 0.3.3-1),
60- python-django-openid-auth (> 0.4-0ubuntu2~), python-django-openid-auth (<= 0.4-0ubuntu2),
61- python-django-piston,
62- python-django-preflight (> 0.1.1~), python-django-preflight (<= 0.1.1),
63- python-django-secure (> 0.1.2~), python-django-secure (<= 0.1.2),
64- python-django-south,
65- python-django-statsd-mozilla (> 0.3.7-0ubuntu1~), python-django-statsd-mozilla (<= 0.3.7-0ubuntu1),
66+ python-beautifulsoup,
67+ python-m2crypto,
68+ python-memcache,
69 python-psycopg2,
70- python-pystatsd (> 0.1.6-0ubuntu1~), python-pystatsd (<= 0.1.6-0ubuntu1),
71- python-statsd (> 1.0.0-0ubuntu1~), python-statsd (<= 1.0.0-0ubuntu1),
72-# sso specific
73- python-memcache,
74- python-django-saml2-idp (> 0.18-0ubuntu2~), python-django-saml2-idp (<= 0.18-0ubuntu2),
75- python-m2crypto,
76- python-oath (> 1.0-0~36~), python-oath (<= 1.0-0~36),
77- python-raven (> 1.4.6~), python-raven (<= 1.4.6),
78 python-simplejson,
79-# required for python-oops (sourcedep)
80- python-paste,
81- python-tz,
82+ python-amqplib,
83+ python-bson,
84 python-iso8601,
85- python-bson,
86 python-launchpadlib,
87- python-amqplib (> 1.0.2ubuntu0~)
88-Description: Meta-package for Canonical OpenID provider web dependencies
89+ python-paste,
90+ python-tz
91+Description: Meta-package for Canonical OpenID provider dependencies
92+
93+Package: canonical-identity-provider-developer-dependencies
94+Architecture: all
95+Depends:
96+ bzr,
97+ config-manager,
98+ fabric,
99+ firefox,
100+ libpq-dev,
101+ libxml2-dev,
102+ libxslt1-dev,
103+ make,
104+ memcached,
105+ postgresql-plpython,
106+ python-dev,
107+ python-setuptools,
108+ python-virtualenv,
109+ screen,
110+ swig,
111+ wget,
112+ xvfb
113+Description: Meta-package for Canonincal OpenID provider dependencies for development
114
115 Package: canonical-identity-provider-database-dependencies
116 Architecture: all

Subscribers

People subscribed via source and target branches