summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-02 13:42:46 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-02 13:42:46 -0300
commit1a2f257cc2f15e3a3ad84c643c2e78ff58972b45 (patch)
tree923187d292002896dcda3b6449827b3df6b58d32
parent4f68e75ecbeb44ba391fa16683a9ec223095b8d9 (diff)
parentff32e6bda529fffa8aaf5ebb9abf9028e7f0917f (diff)
Merge remote-tracking branch 'kali/feature/update-dependencies' into develop
-rw-r--r--changes/VERSION_COMPAT1
-rw-r--r--pkg/requirements.pip1
2 files changed, 1 insertions, 1 deletions
diff --git a/changes/VERSION_COMPAT b/changes/VERSION_COMPAT
index 425478c8..ac2d2e73 100644
--- a/changes/VERSION_COMPAT
+++ b/changes/VERSION_COMPAT
@@ -9,3 +9,4 @@
# BEGIN DEPENDENCY LIST -------------------------
# leap.foo.bar>=x.y.z
leap.common >= 0.3.4 # because the ca_bundle
+leap.keymanager >= 0.3.3 # because the gnupg dep
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 154e51b4..269a4646 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -14,7 +14,6 @@ psutil
ipaddr
twisted
qt4reactor
-python-gnupg
python-daemon # this should not be needed for Windows.
keyring