[Python-modules-commits] [pyee] 08/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 896e2bad269e74aeea67827e0f355706e4de6def
Merge: e5199f8 ac55b11
Author: Ethan Ward <ethan.ward at mycroft.ai>
Date:   Tue Jul 25 11:05:10 2017 -0500

    merge patched into master

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

diff --cc debian/.git-dpm
index 4300564,0000000..a2c2c0c
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
- 73253aee3b0ab1d75b5689ea15fb07e2427e1d4e
- 73253aee3b0ab1d75b5689ea15fb07e2427e1d4e
++ac55b118f22cc85d25007ef4a2f121b04ac363b5
++ac55b118f22cc85d25007ef4a2f121b04ac363b5
 +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/0003-Add-version.patch
index 0000000,0000000..78067b3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Add-version.patch
@@@ -1,0 -1,0 +1,22 @@@
++From ac55b118f22cc85d25007ef4a2f121b04ac363b5 Mon Sep 17 00:00:00 2001
++From: Ethan Ward <ethan.ward at mycroft.ai>
++Date: Tue, 25 Jul 2017 11:05:02 -0500
++Subject: Add version
++
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 2f9ccbf..60edbe7 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -11,7 +11,7 @@ with open(README_rst, 'r') as f:
++ setup(
++     name="pyee",
++     #vcversioner={},
++-
+++    version="3.0.3"
++     packages=find_packages(),
++     setup_requires=['pytest-runner'],#, 'vcversioner'],
++     tests_require=['twisted'],
diff --cc debian/patches/series
index 18f4c55,0000000..6aeb027
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Remove-vcversioner-creates-errors-with-gbp-buildpack.patch
 +0002-Add-missing-comma.patch
++0003-Add-version.patch

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