[tor-commits] [ooni-probe/master] Dependency dnspython removed

[art at torproject.org]

commit a4b2792f94094e3780a06395a8b789aef149bfcc
Author: Arun Pandian G <arunpandianp at gmail.com>
Date:   Wed Mar 26 07:16:01 2014 +0530

    Dependency dnspython removed
---
 debian/control        |    1 -
 requirements.txt      |    1 -
 setup-dependencies.sh |    2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index ba7281b..9bdf641 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,6 @@ Depends: ${misc:Depends}, ${python:Depends},
                tcpdump,
                tor,
                python-all (>= 2.6.6-3~),
-               python-dnspython,
                python-dumbnet,
                python-geoip (>= 0.2.5),
                python-ipaddr (>= 2.1.10),
diff --git a/requirements.txt b/requirements.txt
index 53709ba..3fb0142 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,5 @@ geoip
 txtorcon>=0.7
 txsocksx>=0.0.2
 parsley>=1.1
-dnspython>=1.10.0
 scapy-real>=2.2.0-dev
 pypcap>=1.1
diff --git a/setup-dependencies.sh b/setup-dependencies.sh
index a6867c7..2aac715 100755
--- a/setup-dependencies.sh
+++ b/setup-dependencies.sh
@@ -896,7 +896,7 @@ case $DISTRO_VERSION in
   echo "[+] Updating OS package list...";
   sudo sudo apt-get update 2>&1 > /dev/null;
   echo "[+] Installing packages for your system...";
-  DO "sudo apt-get -y install curl git-core python python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap python-dnspython tor tor-geoipdb libgeoip-dev libpcap0.8-dev" "0"
+  DO "sudo apt-get -y install curl git-core python python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap tor tor-geoipdb libgeoip-dev libpcap0.8-dev" "0"
 
   if [ "$PRIV_MODE" -eq "0" ]; then
     echo "[+] Using virtualenvironment..."