[Python-modules-commits] [python-zeroconf] 07/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 5d1a5fc5e1adcb3df3adc94f6b1742108d8fb6bd
Merge: dead1f7 194ec0f
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Sep 13 19:43:56 2015 +0200

    merge patched into master

 debian/.git-dpm                           |  4 ++--
 debian/patches/0001-This-is-a-patch.patch | 18 ++++++++++++++++++
 debian/patches/series                     |  1 +
 setup.py                                  |  1 +
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index c63822e,0000000..7872430
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
- d1ee5ce7558060ea8d92f804172f67f960f814bb
- d1ee5ce7558060ea8d92f804172f67f960f814bb
++194ec0f3a876a38b30764e8e3f212c73878cc2ac
++194ec0f3a876a38b30764e8e3f212c73878cc2ac
 +d1ee5ce7558060ea8d92f804172f67f960f814bb
 +d1ee5ce7558060ea8d92f804172f67f960f814bb
 +python-zeroconf_0.17.2.orig.tar.gz
 +b635976809dd362dc7b2b4cf7948059eceed103d
 +27798
diff --cc debian/patches/0001-This-is-a-patch.patch
index 0000000,0000000..d26d7c2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-This-is-a-patch.patch
@@@ -1,0 -1,0 +1,18 @@@
++From 194ec0f3a876a38b30764e8e3f212c73878cc2ac Mon Sep 17 00:00:00 2001
++From: Ruben Undheim <ruben.undheim at gmail.com>
++Date: Sun, 13 Sep 2015 19:43:44 +0200
++Subject: This is a patch
++
++---
++ setup.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/setup.py b/setup.py
++index 54e05e1..b133cf9 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -56,3 +56,4 @@ setup(
++         'six',
++     ],
++ )
+++print "I'm testing a new patch"
diff --cc debian/patches/series
index 0000000,0000000..d476f9a
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-This-is-a-patch.patch

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