Merge lp:~diogobaeder/canonical-identity-provider/psutil-deps into lp:canonical-identity-provider/release
Status: | Superseded |
---|---|
Proposed branch: | lp:~diogobaeder/canonical-identity-provider/psutil-deps |
Merge into: | lp:canonical-identity-provider/release |
Diff against target: |
417 lines (+386/-0) (has conflicts) 6 files modified
Makefile (+5/-0) debian/changelog (+301/-0) debian/compat (+1/-0) debian/control (+69/-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:~diogobaeder/canonical-identity-provider/psutil-deps |
Related bugs: | |
Related blueprints: |
Full public OpenID service
(Medium)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Canonical ISD hackers | Pending | ||
Review via email: mp+195646@code.launchpad.net |
This proposal has been superseded by a proposal from 2013-11-18.
Commit message
Adding python-bcrypt and python-psutil
Description of the change
Adding python-bcrypt and python-psutil
Unmerged revisions
- 49. By Diogo Baeder
-
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
- 40. By Ricardo Kirkner
-
switched gargoyle and nexus to sourcedeps