[Python-modules-commits] [vine] 07/08: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository vine.

commit 14e150b67c0d034dd017783b3231eae507236082
Merge: c8cea98 0b73c82
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Thu Feb 16 20:40:36 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../patches/0002-Add-test_suite-to-setup.py.patch  | 24 ----------------------
 debian/patches/series                              |  1 -
 setup.py                                           |  1 -
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --cc debian/.git-dpm
index 382c1cd,0000000..d04f2d9
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
- 5f6559a5252172ca3080609d90423ad2b72995c8
- 5f6559a5252172ca3080609d90423ad2b72995c8
++0b73c823ff5ae3cf55ee8505461995978019b30d
++0b73c823ff5ae3cf55ee8505461995978019b30d
 +6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
 +6633143b4f28ec57dab8a04dbbd2e8ca1bbadc43
 +vine_1.1.3+dfsg.orig.tar.gz
 +b80f204c4f5e18d01e1c85974a15354f1b330f06
 +49282
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index 66bc464,0000000..c13357b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +0001-Remove-image-from-remote-donation-site-privacy-issue.patch
- 0002-Add-test_suite-to-setup.py.patch

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