[Python-modules-commits] [python-zeroconf] 09/17: 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 4f519bcdb5b55366de7152139eed17943e723250
Merge: 5d1a5fc 265b447
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Sep 13 19:51:29 2015 +0200

    merge patched into master

 debian/.git-dpm                                 |  4 ++--
 debian/patches/0002-This-is-another-patch.patch | 21 +++++++++++++++++++++
 debian/patches/series                           |  1 +
 setup.cfg                                       |  1 +
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 7872430,0000000..3ca8f34
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 194ec0f3a876a38b30764e8e3f212c73878cc2ac
- 194ec0f3a876a38b30764e8e3f212c73878cc2ac
++265b447c7ed671f69a49eb5550d6752e12bd2a9d
++265b447c7ed671f69a49eb5550d6752e12bd2a9d
 +d1ee5ce7558060ea8d92f804172f67f960f814bb
 +d1ee5ce7558060ea8d92f804172f67f960f814bb
 +python-zeroconf_0.17.2.orig.tar.gz
 +b635976809dd362dc7b2b4cf7948059eceed103d
 +27798
diff --cc debian/patches/0002-This-is-another-patch.patch
index 0000000,0000000..f6e596f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-This-is-another-patch.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 265b447c7ed671f69a49eb5550d6752e12bd2a9d Mon Sep 17 00:00:00 2001
++From: Ruben Undheim <ruben.undheim at gmail.com>
++Date: Sun, 13 Sep 2015 19:51:19 +0200
++Subject: This is another patch
++
++---
++ setup.cfg | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/setup.cfg b/setup.cfg
++index 51017e1..d8249c7 100644
++--- a/setup.cfg
+++++ b/setup.cfg
++@@ -1,6 +1,7 @@
++ [wheel]
++ universal = 1
++ 
+++Another patched thing
++ [flake8]
++ show-source = 1
++ import-order-style=google
diff --cc debian/patches/series
index d476f9a,0000000..8366fba
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-This-is-a-patch.patch
++0002-This-is-another-patch.patch

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