[Pkg-privacy-commits] [txtorcon] 01/02: Make ipaddress a conditional dependency (See: #880246)

[Iain R. Learmonth]

This is an automated email from the git hooks/post-receive script.

irl pushed a commit to branch master
in repository txtorcon.

commit b99520b93a043581fa01ac85ca182f77e60cc002
Author: Iain R. Learmonth <irl at debian.org>
Date:   Sun Jan 7 22:25:40 2018 +0000

    Make ipaddress a conditional dependency (See: #880246)
---
 .../make-ipaddress-a-conditional-dependency.patch      | 18 ++++++++++++++++++
 debian/patches/series                                  |  1 +
 2 files changed, 19 insertions(+)

diff --git a/debian/patches/make-ipaddress-a-conditional-dependency.patch b/debian/patches/make-ipaddress-a-conditional-dependency.patch
new file mode 100644
index 0000000..2e60483
--- /dev/null
+++ b/debian/patches/make-ipaddress-a-conditional-dependency.patch
@@ -0,0 +1,18 @@
+Description: Make ipaddress a conditional dependency
+Origin: https://github.com/meejah/txtorcon/commit/86f4bfc6434f7c05efa5a2d1e112c80b7ae5ff4d
+Bug: #247
+Bug-Debian: https://bugs.debian.org/880246
+Reviewed-By: Iain R. Learmonth <irl at debian.org>
+Last-Update: 2018-01-07
+
+--- txtorcon-0.19.3.orig/requirements.txt
++++ txtorcon-0.19.3/requirements.txt
+@@ -2,7 +2,7 @@
+ ## hmm, travis-ci doesn't like this since we need a GeoIP-dev package
+ ##GeoIP>=1.2.9
+ Twisted[tls]>=15.5.0
+-ipaddress>=1.0.16
++ipaddress>=1.0.16 ; python_version<'3'
+ zope.interface>=3.6.1
+ incremental
+ automat
diff --git a/debian/patches/series b/debian/patches/series
index ed80250..617af51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disable_test_for_invalid_geoip.patch
 remove-privacy-infringing-buttons.patch
 remove-privacy-infringing-JS.patch
+make-ipaddress-a-conditional-dependency.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/txtorcon.git