[Pkg-privacy-commits] [Git][pkg-privacy-team/txtorcon][master] 2 commits: Make ipaddress a conditional dependency (See: #880246)

[Ulrike Uhlig]

Ulrike Uhlig pushed to branch master at Privacy Maintainers / txtorcon


Commits:
b99520b9 by Iain R. Learmonth at 2018-01-07T22:25:40+00:00
Make ipaddress a conditional dependency (See: #880246)

- - - - -
aa76dac7 by Iain R. Learmonth at 2018-01-07T22:58:41+00:00
Update changelog for release

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/make-ipaddress-a-conditional-dependency.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+txtorcon (0.19.3-4) unstable; urgency=medium
+
+  * Make ipaddress a conditional dependency (See: #880246)
+
+ -- Iain R. Learmonth <irl at debian.org>  Sun, 07 Jan 2018 22:58:15 +0000
+
 txtorcon (0.19.3-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/make-ipaddress-a-conditional-dependency.patch
=====================================
--- /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


=====================================
debian/patches/series
=====================================
--- 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



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/txtorcon/compare/90dd1225a35f7c9ec377015ff5e6c61ff06d9acf...aa76dac78f2fd70098283d5359a8fa90b41d5cdd

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/txtorcon/compare/90dd1225a35f7c9ec377015ff5e6c61ff06d9acf...aa76dac78f2fd70098283d5359a8fa90b41d5cdd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20180528/e1767067/attachment-0001.html>