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

[Ruben Undheim]

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

rubund-guest pushed a commit to tag debian/0.17.4-2
in repository python-zeroconf.

commit 4d15fa97b405654781ef6ea77a8471c5cda86efd
Merge: 012560b eaa2a8e
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Mar 6 10:27:05 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ..._requires-to-enum34-instead-of-enum-compa.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 8a14c53,0000000..0a6878a
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
- 0b9093de863928d7f13092aaf2be1f0a33f4ead2
- 0b9093de863928d7f13092aaf2be1f0a33f4ead2
++eaa2a8ed38eaa8e15036974101f11cb95eec8db1
++eaa2a8ed38eaa8e15036974101f11cb95eec8db1
 +0b9093de863928d7f13092aaf2be1f0a33f4ead2
 +0b9093de863928d7f13092aaf2be1f0a33f4ead2
 +python-zeroconf_0.17.4.orig.tar.gz
 +ad06e8f202bcf2175627d085fba886b58af1116f
 +28205
 +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 0000000,0000000..92547ab
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Set-install_requires-to-enum34-instead-of-enum-compa.patch
@@@ -1,0 -1,0 +1,22 @@@
++From eaa2a8ed38eaa8e15036974101f11cb95eec8db1 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
++--- a/setup.py
+++++ b/setup.py
++@@ -51,7 +51,7 @@ setup(
++         'mDNS',
++     ],
++     install_requires=[
++-        'enum-compat',
+++        'enum34',
++         'netifaces',
++         'six',
++     ],
diff --cc debian/patches/series
index 0000000,0000000..fce4913
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Set-install_requires-to-enum34-instead-of-enum-compa.patch

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