[Python-modules-commits] [pyee] 03/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 1f6b0b907dae2221afd5a29834689110bbf30392
Merge: 0dd83d7 9d5aa1e
Author: Ethan Ward <ethan.ward at mycroft.ai>
Date:   Tue Jul 25 10:58:22 2017 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...rsioner-creates-errors-with-gbp-buildpack.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  4 ++--
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index b7e120a,0000000..eb01ac6
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
- a53727b59001424354a52a0bd190907ab41d4c7f
- a53727b59001424354a52a0bd190907ab41d4c7f
++9d5aa1e025bdad9ad35d176f3365a22ab20210ff
++9d5aa1e025bdad9ad35d176f3365a22ab20210ff
 +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/0001-Remove-vcversioner-creates-errors-with-gbp-buildpack.patch
index 0000000,0000000..d69c2f0
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-vcversioner-creates-errors-with-gbp-buildpack.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 9d5aa1e025bdad9ad35d176f3365a22ab20210ff Mon Sep 17 00:00:00 2001
++From: Ethan Ward <ethan.ward at mycroft.ai>
++Date: Tue, 25 Jul 2017 10:58:17 -0500
++Subject: Remove vcversioner, creates errors with gbp buildpackage
++
++---
++ setup.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index a2a0827..24b6a02 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -10,10 +10,10 @@ with open(README_rst, 'r') as f:
++ 
++ setup(
++     name="pyee",
++-    vcversioner={},
+++    #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 0000000,0000000..abf4a18
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-vcversioner-creates-errors-with-gbp-buildpack.patch

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