[tor-commits] [ooni-probe/master] Update the debian packaging related files

[art at torproject.org]

commit 3d2a7598b1b99035584d90e7821945b81bf729a7
Author: Arturo Filastò <art at fuffa.org>
Date:   Sun Jan 12 18:22:40 2014 +0100

    Update the debian packaging related files
---
 debian/changelog |    2 +-
 debian/control   |   20 ++++++++++++++++----
 debian/rules     |    2 ++
 requirements.txt |    4 +---
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 05b6f6d..7d66611 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ ooniprobe (1.0.0-rc5-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #XXXXXX)
 
- -- Open Observatory of Network Interference <ooni-dev at torproject.org> Fri, 3 Jan 2014 11:14:46 +0200
+ -- OONI Developers <ooni-dev at lists.torproject.org>  Fri, 3 Jan 2014 11:14:46 +0200
diff --git a/debian/control b/debian/control
index 60f42cb..b5fcaec 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,10 @@ Section: net
 Priority: extra
 Build-Depends: debhelper (>= 8),
                python-all (>= 2.6.6-3~),
-               python-dnspython (>= 1.10.0),
+               python-dnspython,
                python-docutils (>= 0.9.1),
-               python-geoip (>= 0.2.5),
                python-ipaddr (>= 2.1.10),
-               python-openssl (>= 0.13),
+               python-openssl,
                python-pyrex,
                python-scapy (>= 2.2),
                python-setuptools,
@@ -27,7 +26,20 @@ Package: ooniprobe
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
                tcpdump,
-               tor
+               tor,
+               python-all (>= 2.6.6-3~),
+               python-dnspython,
+               python-geoip (>= 0.2.5),
+               python-ipaddr (>= 2.1.10),
+               python-openssl,
+               python-pyrex,
+               python-scapy (>= 2.2),
+               python-setuptools,
+               python-twisted (>= 12.2.0),
+               python-txsocksx,
+               python-txtorcon (>= 0.7),
+               python-yaml (>= 3.10),
+               python-zope.interface (>= 3.6),
 Suggests: obfsproxy
 Description: probe for the Open Observatory of Network Interference (OONI)
  OONI, the Open Observatory of Network Interference, is a global observation
diff --git a/debian/rules b/debian/rules
index 579a1b1..9f48e79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,5 @@
 
 %:
 	dh $@ --buildsystem=python_distutils --with=python2
+override_dh_python2:
+		dh_python2 --no-guessing-deps
diff --git a/requirements.txt b/requirements.txt
index 638b33b..ca46ca9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,9 +4,7 @@ argparse>=1.2.1
 docutils>=0.9.1
 ipaddr>=2.1.10
 pyOpenSSL>=0.13
-# XXX fix this once the following issue is resolved: https://github.com/appliedsec/pygeoip/issues/56
-https://github.com/appliedsec/pygeoip/archive/master.zip#egg=pygeoip-0.3.1
-pygeoip>=0.3.1
+geoip
 txtorcon>=0.7
 txsocksx>=0.0.2
 Pyrex>=0.9.8.6