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

Proposed by vyverjet
Status: Rejected
Rejected by: Ricardo Kirkner
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/dependencies
Merge into: lp:canonical-identity-provider/release
Diff against target: 427 lines (+396/-0) (has conflicts)
6 files modified
Makefile (+5/-0)
debian/changelog (+307/-0)
debian/compat (+1/-0)
debian/control (+73/-0)
debian/copyright (+7/-0)
debian/rules (+3/-0)
Conflict adding file debian.  Moved existing file to debian.moved.
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/dependencies
Reviewer Review Type Date Requested Status
Canonical ISD hackers Pending
Review via email: mp+215780@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

50. By Natalia Bidart

Alphabetized control file for dependencies.

49. By Diogo Baeder

[r=ricardokirkner] Adding python-bcrypt and python-psutil

48. By Ricardo Kirkner

added postgresql contrib package

47. By Natalia Bidart

[r=beuno] * Added bzr dependency to show revnos on preflight page.
* Added python-lxml needed from pyquery.
* Fixed some typos on descriptions.
* Fixed lintian warnings.
* Added missing dependency gettext.

46. By Ricardo Kirkner

simplified dependency meta-packages and targetted them at precise

45. By Ricardo Kirkner

fine-tuned required version of python-amqplib

44. By Ricardo Kirkner

updated changelog

43. By Ricardo Kirkner

purged meta-package of (now-)sourcedeps dependencies

42. By Ricardo Kirkner

added python-paste dependency

41. By Ricardo Kirkner

updated meta-package to track new python-tz dependency

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 2014-04-15 00:17:09 +0000
4@@ -0,0 +1,5 @@
5+source:
6+ dpkg-buildpackage -S -I.bzr -I.env
7+
8+binary:
9+ dpkg-buildpackage -I.bzr -I.env
10
11=== added directory 'debian'
12=== renamed directory 'debian' => 'debian.moved'
13=== added file 'debian/changelog'
14--- debian/changelog 1970-01-01 00:00:00 +0000
15+++ debian/changelog 2014-04-15 00:17:09 +0000
16@@ -0,0 +1,307 @@
17+canonical-identity-provider-dependencies (14.01.13) precise; urgency=low
18+
19+ * Alphabetized control file for dependencies.
20+
21+ -- Natalia Bidart (nessita) <natalia.bidart@ubuntu.com> Mon, 13 Jan 2014 10:26:23 -0200
22+
23+canonical-identity-provider-dependencies (13.11.18) precise; urgency=low
24+
25+ * Added python-bcrypt to support bcrypt encryption.
26+ * Added python-psutil for cypher load tests.
27+
28+ -- Diogo Baeder <diogo.baeder@canonical.com> Mon, 18 Nov 2013 17:52:03 -0200
29+
30+canonical-identity-provider-dependencies (13.11.04) precise; urgency=low
31+
32+ * Added postgresql-contrib dependency to support trigram extension
33+
34+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 04 Oct 2013 08:47:23 -0300
35+
36+canonical-identity-provider-dependencies (13.07.09) precise; urgency=low
37+
38+ * Added bzr dependency to show revnos on preflight page.
39+ * Added python-lxml needed from pyquery.
40+ * Fixed some typos on descriptions.
41+ * Fixed lintian warnings.
42+ * Added missing dependency gettext.
43+
44+ -- Natalia Bidart (nessita) <natalia.bidart@ubuntu.com> Tue, 09 Jul 2013 17:04:25 -0300
45+
46+canonical-identity-provider-dependencies (13.06.26-1) precise; urgency=low
47+
48+ * added missing dependency
49+
50+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 26 Jun 2013 21:02:16 -0300
51+
52+canonical-identity-provider-dependencies (13.06.26) precise; urgency=low
53+
54+ * added missing developer dependencies for acceptance tests
55+
56+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 26 Jun 2013 18:31:53 -0300
57+
58+canonical-identity-provider-dependencies (13.06.25) precise; urgency=low
59+
60+ * Moved main target to precise
61+ * Removed any non-packaged dependencies
62+ * Added developer dependencies meta-package
63+
64+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 25 Jun 2013 17:37:16 -0300
65+
66+canonical-identity-provider-dependencies (13.05.22) lucid; urgency=low
67+
68+ * Pinned python-amqlib to > 1.0.2ubuntu0~
69+
70+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 22 May 2013 11:04:24 -0300
71+
72+canonical-identity-provider-dependencies (13.05.20) lucid; urgency=low
73+
74+ * Removed no longer needed package dependencies (python-configglue,
75+ python-django-configglue, python-django-jsonfield, python-oauth,
76+ python-openid, python-wsgi-oops)
77+ * Added missing package dependencies (python-iso8601, python-bson,
78+ python-launchpadlib, python-amqplib)
79+
80+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 20 May 2013 14:34:41 -0300
81+
82+canonical-identity-provider-dependencies (13.04.10) lucid; urgency=low
83+
84+ * Added python-paste as a dependency (required by python-oops, which is
85+ tracked as sourcedep)
86+
87+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 10 Apr 2013 13:50:36 -0300
88+
89+canonical-identity-provider-dependencies (13.02.20) lucid; urgency=low
90+
91+ * Added python-tz as a dependency (required by python-oops, which is tracked
92+ as sourcedep)
93+
94+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 20 Mar 2013 17:29:19 -0300
95+
96+canonical-identity-provider-dependencies (13.02.08) lucid; urgency=low
97+
98+ * Bumped version for dependency django-oauth-backend to 0.2.3.
99+
100+ -- Natalia Bidart (nessita) <natalia.bidart@ubuntu.com> Wed, 08 Feb 2013 10:48:17 -0300
101+
102+canonical-identity-provider-dependencies (13.01.17) lucid; urgency=low
103+
104+ * updated saml2idp version
105+
106+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Thu, 17 Jan 2013 15:33:43 -0300
107+
108+canonical-identity-provider-dependencies (13.01.15) lucid; urgency=low
109+
110+ * added django-secure dependency
111+
112+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 15 Jan 2013 13:14:51 -0300
113+
114+canonical-identity-provider-dependencies (12.09.20) lucid; urgency=low
115+
116+ * added statsd and django-statsd as dependencies
117+
118+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Thu, 20 Sep 2012 15:57:48 -0300
119+
120+canonical-identity-provider-dependencies (12.09.07-2) lucid; urgency=low
121+
122+ * use IS compatible version of python-configglue 1.0.3
123+
124+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 07 Sep 2012 16:46:27 -0300
125+
126+canonical-identity-provider-dependencies (12.09.07-1) lucid; urgency=low
127+
128+ * bumped python-django-saml2-idp version in requirements
129+
130+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 07 Sep 2012 13:54:35 -0300
131+
132+canonical-identity-provider-dependencies (12.09.07-0ubuntu1) lucid; urgency=low
133+
134+ * updated saml2idp dependency
135+
136+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 07 Sep 2012 12:06:47 -0300
137+
138+canonical-identity-provider-dependencies (12.09.03-2) lucid; urgency=low
139+
140+ * Fixed to require django-adminaudit 0.3.3-1
141+
142+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 03 Sep 2012 19:44:10 -0300
143+
144+canonical-identity-provider-dependencies (12.09.03-1) lucid; urgency=low
145+
146+ * Updated django-adminaudit to 0.3.3
147+
148+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 03 Sep 2012 19:36:56 -0300
149+
150+canonical-identity-provider-dependencies (12.09.03) lucid; urgency=low
151+
152+ * Fixed broken python-configglue depedencye
153+
154+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 03 Sep 2012 18:34:58 -0300
155+
156+canonical-identity-provider-dependencies (12.07.10-2) lucid; urgency=low
157+
158+ * Fixed broken dependencies in control file
159+
160+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 10 Jul 2012 16:44:23 -0300
161+
162+canonical-identity-provider-dependencies (12.07.10-1) lucid; urgency=low
163+
164+ * Fixed broken dependencies in control file
165+
166+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 10 Jul 2012 16:44:23 -0300
167+
168+canonical-identity-provider-dependencies (12.07.10) lucid; urgency=low
169+
170+ * Updated dependency: python-saml2idp==0.15-0ubuntu1 -> python-django-saml2-idp==0.15-0ubuntu2
171+
172+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 10 Jul 2012 11:17:14 -0300
173+
174+canonical-identity-provider-dependencies (12.07.05) precise; urgency=low
175+
176+ * Updated dependency: python-saml2idp==0.14-1 -> python-django-saml2-idp==0.15-0ubuntu1
177+
178+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 04 Jul 2012 21:59:48 +0000
179+
180+canonical-identity-provider-dependencies (12.06.21) precise; urgency=low
181+
182+ * Updated meta-package to better handle alternate packages for same version
183+ of dependencies
184+ * Updated meta-package to not require explicit version for dependencies
185+ available in precise
186+ * Updated meta-package to require explicit version for dependencies not
187+ available in precise
188+
189+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Thu, 21 Jun 2012 16:35:31 +0000
190+
191+canonical-identity-provider-dependencies (12.05.31-0ubuntu1) lucid; urgency=low
192+
193+ * Fixed configglue/django-configglue version numbers
194+
195+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Thu, 31 May 2012 12:05:52 +0000
196+
197+canonical-identity-provider-dependencies (12.05.30-0ubuntu2) lucid; urgency=low
198+
199+ * Updated configglue package versions to work with IS maintained packages
200+
201+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 30 May 2012 20:56:56 +0000
202+
203+canonical-identity-provider-dependencies (12.05.30-0ubuntu1) lucid; urgency=low
204+
205+ * Updated dependency version of configglue
206+
207+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 30 May 2012 18:44:02 +0000
208+
209+canonical-identity-provider-dependencies (12.04.24-0ubuntu1) lucid; urgency=low
210+
211+ * Updated dependency version of configglue
212+
213+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 24 Apr 2012 15:30:53 -0300
214+
215+canonical-identity-provider-dependencies (12.03.05-0ubuntu1) lucid; urgency=low
216+
217+ * Added missing simplejson dependency
218+
219+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 05 Mar 2012 09:36:48 -0300
220+
221+canonical-identity-provider-dependencies (12.02.29-0ubuntu1) lucid; urgency=low
222+
223+ * Added raven as a dependency
224+
225+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 29 Feb 2012 12:50:48 -0300
226+
227+canonical-identity-provider-dependencies (12.02.24-0ubuntu1) lucid; urgency=low
228+
229+ * Added BeautfilSoup as a dependency (needed for saml2idp)
230+
231+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 24 Feb 2012 11:53:03 -0300
232+
233+canonical-identity-provider-dependencies (12.01.27-0ubuntu1) lucid; urgency=low
234+
235+ * Added python-oath as a dependency
236+
237+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 27 Jan 2012 12:16:49 -0300
238+
239+canonical-identity-provider-dependencies (12.01.20-0ubuntu2) lucid; urgency=low
240+
241+ * Added python-m2crypto as a dependency
242+
243+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 20 Jan 2012 14:13:15 -0300
244+
245+canonical-identity-provider-dependencies (12.01.20-0ubuntu1) lucid; urgency=low
246+
247+ * Added python-nexus as a dependency
248+
249+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 20 Jan 2012 12:15:39 -0300
250+
251+canonical-identity-provider-dependencies (12.01.09-0ubuntu1) lucid; urgency=low
252+
253+ * Relaxed restriction on python-configglue dependency version
254+ * Relaxed restriction on python-django-configglue dependency version
255+
256+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 09 Jan 2012 13:27:32 -0300
257+
258+canonical-identity-provider-dependencies (12.01.05-0ubuntu2) lucid; urgency=low
259+
260+ * Fixed typo in control file
261+
262+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Thu, 05 Jan 2012 15:46:51 -0300
263+
264+canonical-identity-provider-dependencies (12.01.05-0ubuntu1) lucid; urgency=low
265+
266+ * Updated python-configglue dependency to 1.0.1
267+ * Updated python-django-configglue dependency to 0.6.1
268+
269+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Thu, 05 Jan 2012 13:46:36 -0300
270+
271+canonical-identity-provider-dependencies (11.12.05-0ubuntu1) lucid; urgency=low
272+
273+ * Added saml2idp as a new dependency
274+
275+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 05 Dec 2011 15:54:39 -0300
276+
277+canonical-identity-provider-dependencies (11.10.05-0ubuntu1) lucid; urgency=low
278+
279+ * Fixed package version of django-preflight dep to match IS requirements
280+
281+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Wed, 05 Oct 2011 16:30:21 -0300
282+
283+canonical-identity-provider-dependencies (11.10.04-0ubuntu1) natty; urgency=low
284+
285+ * Require django-preflight >= 0.1.1
286+
287+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 04 Oct 2011 13:09:44 -0300
288+
289+canonical-identity-provider-dependencies (11.08.25-0ubuntu1) lucid; urgency=low
290+
291+ * Updated wsgi-oops dependency to >= 0.1~bzr60-1
292+
293+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Thu, 25 Aug 2011 14:51:01 -0300
294+
295+canonical-identity-provider-dependencies (11.08.15-0ubuntu1) lucid; urgency=low
296+
297+ * Added extra dependencies (gargoyle, django-adminaudit and python-pystatsd)
298+
299+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Mon, 15 Aug 2011 15:53:02 -0300
300+
301+canonical-identity-provider-dependencies (11.08.05-0ubuntu1) lucid; urgency=low
302+
303+ * Updated django requirement to 1.3
304+
305+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Fri, 05 Aug 2011 16:28:36 -0300
306+
307+canonical-identity-provider-dependencies (11.07.26-0ubuntu3) lucid; urgency=low
308+
309+ * Fine-tune version requirements to cope with IS backporting strategy
310+
311+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 26 Jul 2011 16:06:33 -0300
312+
313+canonical-identity-provider-dependencies (11.07.26-0ubuntu2) lucid; urgency=low
314+
315+ * Split multiple version checks into different lines
316+
317+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 26 Jul 2011 11:23:31 -0300
318+
319+canonical-identity-provider-dependencies (11.07.26-0ubuntu1) lucid; urgency=low
320+
321+ * Initial release
322+
323+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Tue, 26 Jul 2011 10:10:47 -0300
324
325=== added file 'debian/compat'
326--- debian/compat 1970-01-01 00:00:00 +0000
327+++ debian/compat 2014-04-15 00:17:09 +0000
328@@ -0,0 +1,1 @@
329+7
330
331=== added file 'debian/control'
332--- debian/control 1970-01-01 00:00:00 +0000
333+++ debian/control 2014-04-15 00:17:09 +0000
334@@ -0,0 +1,73 @@
335+Source: canonical-identity-provider-dependencies
336+Section: misc
337+Priority: extra
338+Build-Depends: cdbs, debhelper
339+Maintainer: Ricardo Kirkner <ricardo.kirkner@canonical.com>
340+Standards-Version: 3.9.4
341+
342+Package: canonical-identity-provider-dependencies
343+Architecture: all
344+Depends:
345+ ${misc:Depends},
346+ bzr,
347+ libapache2-mod-wsgi,
348+ python-amqplib,
349+ python-bcrypt,
350+ python-beautifulsoup,
351+ python-bson,
352+ python-iso8601,
353+ python-launchpadlib,
354+ python-lxml,
355+ python-m2crypto,
356+ python-memcache,
357+ python-paste,
358+ python-psutil,
359+ python-psycopg2,
360+ python-simplejson,
361+ python-tz
362+Description: metapackage for Canonical OpenID provider dependencies
363+ A bag of dependencies for the Canonical OpenID provider.
364+
365+Package: canonical-identity-provider-developer-dependencies
366+Architecture: all
367+Depends:
368+ ${misc:Depends},
369+ bzr,
370+ config-manager,
371+ fabric,
372+ firefox,
373+ gettext,
374+ libpq-dev,
375+ libxml2-dev,
376+ libxslt1-dev,
377+ make,
378+ memcached,
379+ postgresql-contrib,
380+ postgresql-plpython,
381+ python-dev,
382+ python-setuptools,
383+ python-virtualenv,
384+ screen,
385+ swig,
386+ wget,
387+ xvfb
388+Description: metapackage for Canonical OpenID provider development dependencies
389+ A bag of developer dependencies for the Canonical OpenID provider.
390+
391+Package: canonical-identity-provider-database-dependencies
392+Architecture: all
393+Depends:
394+ ${misc:Depends},
395+ postgresql,
396+ postgresql-contrib,
397+ postgresql-plpython
398+Description: metapackage for Canonical OpenID provider database dependencies
399+ A bag of database dependencies for the Canonical OpenID provider.
400+
401+Package: canonical-identity-provider-cache-dependencies
402+Architecture: all
403+Depends:
404+ ${misc:Depends},
405+ memcached
406+Description: metapackage for Canonical OpenID provider cache dependencies
407+ A bag of cache dependencies for the Canonical OpenID provider.
408
409=== added file 'debian/copyright'
410--- debian/copyright 1970-01-01 00:00:00 +0000
411+++ debian/copyright 2014-04-15 00:17:09 +0000
412@@ -0,0 +1,7 @@
413+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
414+Upstream-Name: Canonical SSO Dependencies
415+Upstream-Maintainer: Canonical ISD Hackers <canonical-isd@lists.launchpad.net>
416+
417+Files: *
418+Copyright: 2011, Canonical ISD Hackers <canonical-isd@lists.launchpad.net>
419+License: AGPL-3
420
421=== added file 'debian/rules'
422--- debian/rules 1970-01-01 00:00:00 +0000
423+++ debian/rules 2014-04-15 00:17:09 +0000
424@@ -0,0 +1,3 @@
425+#!/usr/bin/make -f
426+
427+include /usr/share/cdbs/1/rules/debhelper.mk