[Python-modules-commits] [pyee] 02/04: 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 4cdd05c2f7d340cde6de4843040ff05ab22f2e72
Merge: 6e2ca98 e509666
Author: Ethan Ward <ethan.ward at mycroft.ai>
Date:   Thu Jul 27 11:04:03 2017 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...rsioner-creates-errors-with-gbp-buildpack.patch | 16 ++++++++++------
 debian/patches/0002-Add-missing-comma.patch        | 22 ----------------------
 debian/patches/0003-Add-version.patch              | 22 ----------------------
 debian/patches/0004-Add-comma.patch                | 22 ----------------------
 debian/patches/series                              |  3 ---
 6 files changed, 12 insertions(+), 77 deletions(-)

diff --cc debian/.git-dpm
index 18d00d4,0000000..d098e90
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
- 4b1238402752a194b769a85312baa5bd0702fcdb
- 4b1238402752a194b769a85312baa5bd0702fcdb
++e5096664ffb6425a86e8cf0d3b044c1cc3525d41
++e5096664ffb6425a86e8cf0d3b044c1cc3525d41
 +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 d69c2f0,0000000..dc7db01
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-vcversioner-creates-errors-with-gbp-buildpack.patch
+++ b/debian/patches/0001-Remove-vcversioner-creates-errors-with-gbp-buildpack.patch
@@@ -1,26 -1,0 +1,30 @@@
- From 9d5aa1e025bdad9ad35d176f3365a22ab20210ff Mon Sep 17 00:00:00 2001
++From e5096664ffb6425a86e8cf0d3b044c1cc3525d41 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
 +
++Add missing comma
++Add version
++Add comma
 +---
-  setup.py | 4 ++--
-  1 file changed, 2 insertions(+), 2 deletions(-)
++ setup.py | 6 +++---
++ 1 file changed, 3 insertions(+), 3 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index a2a0827..24b6a02 100644
++index a2a0827..e2c7299 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -10,10 +10,10 @@ with open(README_rst, 'r') as f:
 + 
 + setup(
 +     name="pyee",
 +-    vcversioner={},
++-
 ++    #vcversioner={},
-  
+++    version="3.0.3",
 +     packages=find_packages(),
 +-    setup_requires=['pytest-runner', 'vcversioner'],
- +    setup_requires=['pytest-runner']#, 'vcversioner'],
+++    setup_requires=['pytest-runner'],#, 'vcversioner'],
 +     tests_require=['twisted'],
 +     include_package_data=True,
 + 
diff --cc debian/patches/series
index fa378dd,0000000..abf4a18
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,1 @@@
 +0001-Remove-vcversioner-creates-errors-with-gbp-buildpack.patch
- 0002-Add-missing-comma.patch
- 0003-Add-version.patch
- 0004-Add-comma.patch

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