Canonical SSO provider

Merge lp:~nataliabidart/canonical-identity-provider/sso-deps-updates into lp:~canonical-isd-hackers/canonical-identity-provider/dependencies

  1. sso-deps-updates
  2. Merge into dependencies
Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: no longer in the source branch.
Merged at revision: 47
Proposed branch: lp:~nataliabidart/canonical-identity-provider/sso-deps-updates
Merge into: lp:~canonical-isd-hackers/canonical-identity-provider/dependencies
Diff against target: 93 lines (+21/-4)
3 files modified
debian/changelog (+11/-1)
debian/control (+9/-2)
debian/copyright (+1/-1)
To merge this branch: bzr merge lp:~nataliabidart/canonical-identity-provider/sso-deps-updates
Reviewer Review Type Date Requested Status
Martin Albisetti (community) Approve
Review via email: mp+173768@code.launchpad.net

Commit message

* 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.

To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-06-27 00:02:32 +0000
3+++ debian/changelog 2013-07-09 20:06:25 +0000
4@@ -1,3 +1,13 @@
5+canonical-identity-provider-dependencies (13.07.09) precise; urgency=low
6+
7+ * Added bzr dependency to show revnos on preflight page.
8+ * Added python-lxml needed from pyquery.
9+ * Fixed some typos on descriptions.
10+ * Fixed lintian warnings.
11+ * Added missing dependency gettext.
12+
13+ -- Natalia Bidart (nessita) <natalia.bidart@ubuntu.com> Tue, 09 Jul 2013 17:04:25 -0300
14+
15 canonical-identity-provider-dependencies (13.06.26-1) precise; urgency=low
16
17 * added missing dependency
18@@ -221,7 +231,7 @@
19 * Updated python-configglue dependency to 1.0.1
20 * Updated python-django-configglue dependency to 0.6.1
21
22- -- Ricardo Kirkner <ricardo.kirkner@canonical.com> _Thu, 05 Jan 2012 13:46:36 -0300
23+ -- Ricardo Kirkner <ricardo.kirkner@canonical.com> Thu, 05 Jan 2012 13:46:36 -0300
24
25 canonical-identity-provider-dependencies (11.12.05-0ubuntu1) lucid; urgency=low
26
27
28=== modified file 'debian/control'
29--- debian/control 2013-06-27 00:02:32 +0000
30+++ debian/control 2013-07-09 20:06:25 +0000
31@@ -3,13 +3,16 @@
32 Priority: extra
33 Build-Depends: cdbs, debhelper
34 Maintainer: Ricardo Kirkner <ricardo.kirkner@canonical.com>
35-Standards-Version: 3.8.3
36+Standards-Version: 3.9.3
37
38 Package: canonical-identity-provider-dependencies
39 Architecture: all
40 Depends:
41+ ${misc:Depends},
42+ bzr,
43 libapache2-mod-wsgi,
44 python-beautifulsoup,
45+ python-lxml,
46 python-m2crypto,
47 python-memcache,
48 python-psycopg2,
49@@ -25,10 +28,12 @@
50 Package: canonical-identity-provider-developer-dependencies
51 Architecture: all
52 Depends:
53+ ${misc:Depends},
54 bzr,
55 config-manager,
56 fabric,
57 firefox,
58+ gettext,
59 libpq-dev,
60 libxml2-dev,
61 libxslt1-dev,
62@@ -42,11 +47,12 @@
63 swig,
64 wget,
65 xvfb
66-Description: Meta-package for Canonincal OpenID provider dependencies for development
67+Description: Meta-package for Canonical OpenID provider development dependencies
68
69 Package: canonical-identity-provider-database-dependencies
70 Architecture: all
71 Depends:
72+ ${misc:Depends},
73 postgresql,
74 postgresql-plpython
75 Description: Meta-package for Canonical OpenID provider database dependencies
76@@ -54,5 +60,6 @@
77 Package: canonical-identity-provider-cache-dependencies
78 Architecture: all
79 Depends:
80+ ${misc:Depends},
81 memcached
82 Description: Meta-package for Canonical OpenID provider cache dependencies
83
84=== modified file 'debian/copyright'
85--- debian/copyright 2011-07-26 13:42:18 +0000
86+++ debian/copyright 2013-07-09 20:06:25 +0000
87@@ -1,5 +1,5 @@
88 Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
89-Upstream-Name: CanonicalSSO Dependencies
90+Upstream-Name: Canonical SSO Dependencies
91 Upstream-Maintainer: Canonical ISD Hackers <canonical-isd@lists.launchpad.net>
92
93 Files: *

Subscribers

People subscribed via source and target branches