From 120a13be2e7ea929a0e6c715a6004ec941cd28ba Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Mon, 31 Aug 2015 15:02:59 -0400
Subject: update dependencies

---
 debian/control       | 13 ++++++-------
 pkg/requirements.pip |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index b774de92..36bbb8db 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,12 @@ Maintainer: Ben Carrillo <ben@futeisha.org>
 Standards-Version: 3.9.6
 Uploaders: Micah Anderson <micah@debian.org>
 Homepage: https://leap.se
-#Vcs-Git: git://git.debian.org/python-applications-team/leap-client.git
-#Vcs-Browser: http://git.debian.org/?p=python-applications-team/leap-client.git;a=summary
 Build-Depends: debhelper (>= 8.0.0), dh-python, python (>=2.6), python-setuptools,
                pep8,
                python-sphinx (>= 1.0.7+dfsg), docutils-common, python-nose, python-mock,
                python-requests (>= 1.2.3), python-srp, python-crypto, python-keyring, python-xdg,
                python-jsonschema (>= 0.7.0), python-psutil, python-openssl,
-               python-dateutil, python-argparse, python-netifaces, pyside-tools,
+               python-dateutil, python-argparse, pyside-tools,
                xvfb, xauth
 X-Python-Version: >= 2.6
 
@@ -27,27 +25,28 @@ Depends:
   python-dateutil,
   python-daemon,
   python-argparse,
+  python-logbook,
   python-psutil,
-  python-netifaces,
   python-requests (>= 1.2.3-1),
-  python-xdg,
   python-jsonschema (>= 0.7.0),
 # temporal pinning until libsodium is in debian
   python-zmq (>= 14.4.1-1.1),
+  python-txzmq,
   python-setuptools,
+  python-zope.proxy,
   openvpn,
   python-pyside.qtcore, 
   python-pyside.qtgui,
   python-pyside.qtsvg,
   python-twisted-core,
   python-leap-common,
-  leap-mail (>= 0.3.11),
+  leap-mail (>= 0.3.99),
   soledad-client
 # Let's skip the Thunderbird Extension, which is installed by default, until we do a public
 # mail release.
 # Recommends: xul-ext-bitmask
 Suggests: policykit-1-gnome
-Enhances: openvpn
+Enhances: openvpn, gnupg
 Description: Provides the desktop client for the LEAP Encryption Access Project Platform.
  LEAP (LEAP Encryption Access Project) develops a plan to secure everyday
  communication, breaking down into discrete services.
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 85645763..4467c32c 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -9,7 +9,7 @@ argparse
 requests>=1.1.0
 srp>=1.0.2
 pyopenssl
-coloredlogs
+#coloredlogs
 
 psutil
 
@@ -27,5 +27,5 @@ txzmq
 # Remove this when u1db fixes its dependency on oauth
 oauth
 
-taskthread
+#taskthread
 logbook
-- 
cgit v1.2.3