diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-27 12:20:29 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-27 12:20:29 -0400 |
| commit | 4951157e3740b42ecef6775c8927b912a6ee8870 (patch) | |
| tree | 00e7bf6c9d14106c8b06dd030b90d130fa8c40bd /debian/control | |
| parent | 1b4458bfc2ce97ec02180793eca0fcca38be4f84 (diff) | |
| parent | 5997cb2c8c2aa2af18079f9a9505731f498fb9a4 (diff) | |
Merge remote-tracking branch 'leapcode/debian' into debian
Conflicts:
MANIFEST.in
debian/changelog
debian/copyright
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/debian/control b/debian/control index 441e3055..b965a664 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,8 @@ X-Python-Version: >= 2.6 Package: bitmask Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, +Depends: + ${misc:Depends}, ${python:Depends}, python-openssl, python-crypto, python-keyring (>= 0.9.2), @@ -30,14 +31,16 @@ Depends: ${misc:Depends}, ${python:Depends}, python-xdg, python-jsonschema (>= 0.7.0), python-setuptools, - python-nose, - python-mock, pep8, openvpn, +#polkit-gnome should not be a hard dep, but a recommends policykit-1-gnome, python-pyside, python-pyside.qtcore, - python-pyside.qtgui + python-pyside.qtgui, + python-leap-common, + leap-mail, + soledad-client Suggests: resolvconf Conflicts: autoresolv Enhances: openvpn |