[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 a9229b593f41a03f003e619465fbde2a03927f7e
Merge: 83583eb 41fb1b4
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Oct 6 19:02:45 2016 +0200

    merge patched into master

 .gitignore                                         |  10 +
 .travis.yml                                        |   1 +
 README.rst                                         |  24 +
 debian/.git-dpm                                    |   6 +-
 ..._requires-to-enum34-instead-of-enum-compa.patch |   6 +-
 setup.cfg                                          |   1 +
 test_zeroconf.py                                   | 226 +++++++-
 zeroconf.py                                        | 639 +++++++++++++--------
 8 files changed, 667 insertions(+), 246 deletions(-)

diff --cc debian/.git-dpm
index 801b473,0000000..b05ec8e
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
- eaa2a8ed38eaa8e15036974101f11cb95eec8db1
- eaa2a8ed38eaa8e15036974101f11cb95eec8db1
- 0b9093de863928d7f13092aaf2be1f0a33f4ead2
++41fb1b4da7a4581010d2c7dad5342945f7db3cae
++41fb1b4da7a4581010d2c7dad5342945f7db3cae
++e694928afacaf099988e8b2c6f40df196df18245
 +e694928afacaf099988e8b2c6f40df196df18245
 +python-zeroconf_0.17.6.orig.tar.gz
 +2aaa079ff2eecd8ab4f7d8f9f16ebeb76a18fc72
 +31309
 +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 92547ab,0000000..cbedd8e
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 eaa2a8ed38eaa8e15036974101f11cb95eec8db1 Mon Sep 17 00:00:00 2001
++From 41fb1b4da7a4581010d2c7dad5342945f7db3cae 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 54e05e1..653d963 100755
++index 75fdf2d..2a8db1b 100755
 +--- a/setup.py
 ++++ b/setup.py
- @@ -51,7 +51,7 @@ setup(
++@@ -53,7 +53,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