[Python-modules-commits] [python-zeroconf] 04/05: 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 f1588f0a235a6849fa7f6d09338f8b7390d3ea26
Merge: e57f56c 5e47ffd
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Mar 17 15:26:15 2017 +0100

    merge patched into master

 .travis.yml                                        |   2 +-
 README.rst                                         |  26 +-
 debian/.git-dpm                                    |   6 +-
 ..._requires-to-enum34-instead-of-enum-compa.patch |   6 +-
 requirements-dev.txt                               |   3 +-
 setup.py                                           |   2 +
 test_zeroconf.py                                   | 306 ++++++++++++++-
 zeroconf.py                                        | 435 ++++++++++++++-------
 8 files changed, 622 insertions(+), 164 deletions(-)

diff --cc debian/.git-dpm
index 38dff9a,0000000..741baac
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
- 41fb1b4da7a4581010d2c7dad5342945f7db3cae
- 41fb1b4da7a4581010d2c7dad5342945f7db3cae
- e694928afacaf099988e8b2c6f40df196df18245
++5e47ffda59a22f7ba7815bb069065f7eb2cd4b9f
++5e47ffda59a22f7ba7815bb069065f7eb2cd4b9f
++8d604d4bb0cba8c3dcdc2cb60df2218d0739aed3
 +8d604d4bb0cba8c3dcdc2cb60df2218d0739aed3
 +python-zeroconf_0.18.0.orig.tar.gz
 +bcd91740c0030a85753b9ce138cadd8e7a9482f9
 +35543
 +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 cbedd8e,0000000..9f066fe
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,22 @@@
- From 41fb1b4da7a4581010d2c7dad5342945f7db3cae Mon Sep 17 00:00:00 2001
++From 5e47ffda59a22f7ba7815bb069065f7eb2cd4b9f 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(-)
 +
 +diff --git a/setup.py b/setup.py
- index 75fdf2d..2a8db1b 100755
++index a8af0a9..a742454 100755
 +--- a/setup.py
 ++++ b/setup.py
- @@ -53,7 +53,7 @@ setup(
++@@ -55,7 +55,7 @@ setup(
 +         'mDNS',
 +     ],
 +     install_requires=[
 +-        'enum-compat',
 ++        'enum34',
 +         'netifaces',
 +         'six',
 +     ],

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