[Python-modules-commits] [pyee] 05/10: merge patched into master

[Ethan Ward]

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

ethanward-guest pushed a commit to branch master
in repository pyee.

commit d553ae8b2e0531dbb38525c4e18b1d04ad6fb59f
Merge: 1f6b0b9 73253ae
Author: Ethan Ward <ethan.ward at mycroft.ai>
Date:   Tue Jul 25 10:59:36 2017 -0500

    merge patched into master

 debian/.git-dpm                             |  4 ++--
 debian/patches/0002-Add-missing-comma.patch | 22 ++++++++++++++++++++++
 debian/patches/series                       |  1 +
 setup.py                                    |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index eb01ac6,0000000..4300564
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
- 9d5aa1e025bdad9ad35d176f3365a22ab20210ff
- 9d5aa1e025bdad9ad35d176f3365a22ab20210ff
++73253aee3b0ab1d75b5689ea15fb07e2427e1d4e
++73253aee3b0ab1d75b5689ea15fb07e2427e1d4e
 +a53727b59001424354a52a0bd190907ab41d4c7f
 +a53727b59001424354a52a0bd190907ab41d4c7f
 +pyee_3.0.3.orig.tar.gz
 +ee0ca9d5134a928547d374ac63fa59dfaf137c93
 +5986
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Add-missing-comma.patch
index 0000000,0000000..890efc9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Add-missing-comma.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 73253aee3b0ab1d75b5689ea15fb07e2427e1d4e Mon Sep 17 00:00:00 2001
++From: Ethan Ward <ethan.ward at mycroft.ai>
++Date: Tue, 25 Jul 2017 10:59:31 -0500
++Subject: Add missing comma
++
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 24b6a02..2f9ccbf 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -13,7 +13,7 @@ setup(
++     #vcversioner={},
++ 
++     packages=find_packages(),
++-    setup_requires=['pytest-runner']#, 'vcversioner'],
+++    setup_requires=['pytest-runner'],#, 'vcversioner'],
++     tests_require=['twisted'],
++     include_package_data=True,
++ 
diff --cc debian/patches/series
index abf4a18,0000000..18f4c55
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Remove-vcversioner-creates-errors-with-gbp-buildpack.patch
++0002-Add-missing-comma.patch

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