[Python-modules-commits] [python-zeroconf] 04/06: merge patched into master

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository python-zeroconf.

commit becbea884d9498d12f0e90d04414bf2ec7f4beb9
Merge: 3f2888a 7021e67
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Jul 13 19:41:54 2017 +0000

    merge patched into master

 .travis.yml                                        |  2 +-
 README.rst                                         | 17 ++++++-
 debian/.git-dpm                                    |  6 +--
 ..._requires-to-enum34-instead-of-enum-compa.patch | 18 +++++---
 examples/browser.py                                |  1 +
 examples/old_browser.py                            | 54 ----------------------
 requirements-dev.txt                               |  3 +-
 zeroconf.py                                        |  2 +-
 8 files changed, 35 insertions(+), 68 deletions(-)

diff --cc debian/.git-dpm
index 1113522,0000000..9739588
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 5e47ffda59a22f7ba7815bb069065f7eb2cd4b9f
- 5e47ffda59a22f7ba7815bb069065f7eb2cd4b9f
- 8d604d4bb0cba8c3dcdc2cb60df2218d0739aed3
++7021e671cb7b2113188419b36b0b823d0e2e8004
++7021e671cb7b2113188419b36b0b823d0e2e8004
++ca5286c3284c6e62d42b24d715ba5d63e76ab81e
 +ca5286c3284c6e62d42b24d715ba5d63e76ab81e
 +python-zeroconf_0.19.1.orig.tar.gz
 +eac776422f3dd8c50b8c525998854ac7a9183ba4
 +35655
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Set-install_requires-to-enum34-instead-of-enum-compa.patch
index 9f066fe,0000000..a66ac38
mode 100644,000000..100644
--- a/debian/patches/0001-Set-install_requires-to-enum34-instead-of-enum-compa.patch
+++ b/debian/patches/0001-Set-install_requires-to-enum34-instead-of-enum-compa.patch
@@@ -1,22 -1,0 +1,28 @@@
- From 5e47ffda59a22f7ba7815bb069065f7eb2cd4b9f Mon Sep 17 00:00:00 2001
++From 7021e671cb7b2113188419b36b0b823d0e2e8004 Mon Sep 17 00:00:00 2001
 +From: Ruben Undheim <ruben.undheim at gmail.com>
 +Date: Sun, 6 Mar 2016 10:26:23 +0100
 +Subject: Set install_requires to enum34 instead of enum-compat
 +
 +---
-  setup.py | 2 +-
-  1 file changed, 1 insertion(+), 1 deletion(-)
++ setup.py | 8 ++------
++ 1 file changed, 2 insertions(+), 6 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index a8af0a9..a742454 100755
++index ddda07c..a742454 100755
 +--- a/setup.py
 ++++ b/setup.py
- @@ -55,7 +55,7 @@ setup(
++@@ -55,12 +55,8 @@ setup(
 +         'mDNS',
 +     ],
 +     install_requires=[
 +-        'enum-compat',
++-        # netifaces 0.10.5 has a bug that results in all interfaces' netmasks
++-        # to be 255.255.255.255 on Windows which breaks things. See:
++-        # * https://github.com/jstasiak/python-zeroconf/issues/84
++-        # * https://bitbucket.org/al45tair/netifaces/issues/39/netmask-is-always-255255255255
++-        'netifaces!=0.10.5',
 ++        'enum34',
-          'netifaces',
+++        'netifaces',
 +         'six',
 +     ],
++ )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-zeroconf.git