[Python-modules-commits] [python-zeroconf] 13/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 f3bafa8165517dd70659b23d178880eb740271ef
Merge: 4f519bc 9a08eb0
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Sep 13 20:14:59 2015 +0200

    merge patched into master

 debian/.git-dpm                                        |  4 ++--
 ...er-patch.patch => 0001-This-is-another-patch.patch} |  2 +-
 debian/patches/0002-Third-patch.patch                  | 18 ++++++++++++++++++
 ...his-is-a-patch.patch => 0003-This-is-a-patch.patch} | 11 ++++++-----
 debian/patches/series                                  |  5 +++--
 setup.cfg                                              |  1 +
 setup.py                                               |  1 +
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --cc debian/.git-dpm
index 3ca8f34,0000000..212e2a1
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
- 265b447c7ed671f69a49eb5550d6752e12bd2a9d
- 265b447c7ed671f69a49eb5550d6752e12bd2a9d
++9a08eb0eeb4ea4e7525b4ab81d03ea212d772b12
++9a08eb0eeb4ea4e7525b4ab81d03ea212d772b12
 +d1ee5ce7558060ea8d92f804172f67f960f814bb
 +d1ee5ce7558060ea8d92f804172f67f960f814bb
 +python-zeroconf_0.17.2.orig.tar.gz
 +b635976809dd362dc7b2b4cf7948059eceed103d
 +27798
diff --cc debian/patches/0001-This-is-another-patch.patch
index f6e596f,0000000..3a4044a
mode 100644,000000..100644
--- a/debian/patches/0001-This-is-another-patch.patch
+++ b/debian/patches/0001-This-is-another-patch.patch
@@@ -1,21 -1,0 +1,21 @@@
- From 265b447c7ed671f69a49eb5550d6752e12bd2a9d Mon Sep 17 00:00:00 2001
++From efd620dcff78446d63cb872409ed6bcd1e83bd5d 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/0002-Third-patch.patch
index 0000000,0000000..acc4d2a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Third-patch.patch
@@@ -1,0 -1,0 +1,18 @@@
++From 7fa958c463703fc6dd3a014108617ad7272c9032 Mon Sep 17 00:00:00 2001
++From: Ruben Undheim <ruben.undheim at gmail.com>
++Date: Sun, 13 Sep 2015 20:14:06 +0200
++Subject: Third patch
++
++---
++ setup.cfg | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/setup.cfg b/setup.cfg
++index d8249c7..afa7707 100644
++--- a/setup.cfg
+++++ b/setup.cfg
++@@ -6,3 +6,4 @@ Another patched thing
++ show-source = 1
++ import-order-style=google
++ application-import-names=zeroconf
+++More things added here ja
diff --cc debian/patches/0003-This-is-a-patch.patch
index d26d7c2,0000000..8d203a3
mode 100644,000000..100644
--- a/debian/patches/0003-This-is-a-patch.patch
+++ b/debian/patches/0003-This-is-a-patch.patch
@@@ -1,18 -1,0 +1,19 @@@
- From 194ec0f3a876a38b30764e8e3f212c73878cc2ac Mon Sep 17 00:00:00 2001
++From 9a08eb0eeb4ea4e7525b4ab81d03ea212d772b12 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(+)
++ setup.py | 2 ++
++ 1 file changed, 2 insertions(+)
 +
 +diff --git a/setup.py b/setup.py
- index 54e05e1..b133cf9 100755
++index 54e05e1..39d1ca2 100755
 +--- a/setup.py
 ++++ b/setup.py
- @@ -56,3 +56,4 @@ setup(
++@@ -56,3 +56,5 @@ setup(
 +         'six',
 +     ],
 + )
 ++print "I'm testing a new patch"
+++More things here as well
diff --cc debian/patches/series
index 8366fba,0000000..3677071
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
- 0001-This-is-a-patch.patch
- 0002-This-is-another-patch.patch
++0001-This-is-another-patch.patch
++0002-Third-patch.patch
++0003-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