[Python-modules-commits] [vine] 05/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 3f0c046a4585c075c30b51644492dca650ff2412
Merge: 6b103c5 5f6559a
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Thu Feb 16 19:18:10 2017 +0000

    merge patched into master

 debian/.git-dpm                                      | 4 ++--
 debian/patches/0002-Add-test_suite-to-setup.py.patch | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 3a3251a,0000000..382c1cd
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
- a8905538937ea249a7eb2fcc26fbc056d70b5327
- a8905538937ea249a7eb2fcc26fbc056d70b5327
++5f6559a5252172ca3080609d90423ad2b72995c8
++5f6559a5252172ca3080609d90423ad2b72995c8
 +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/0002-Add-test_suite-to-setup.py.patch
index b657a0c,0000000..2c8689b
mode 100644,000000..100644
--- a/debian/patches/0002-Add-test_suite-to-setup.py.patch
+++ b/debian/patches/0002-Add-test_suite-to-setup.py.patch
@@@ -1,21 -1,0 +1,24 @@@
- From a8905538937ea249a7eb2fcc26fbc056d70b5327 Mon Sep 17 00:00:00 2001
++From 5f6559a5252172ca3080609d90423ad2b72995c8 Mon Sep 17 00:00:00 2001
 +From: Christopher Hoskin <mans0954 at debian.org>
 +Date: Thu, 16 Feb 2017 19:08:46 +0000
 +Subject: Add test_suite to setup.py
 +
++Forwarded: https://github.com/celery/vine/pull/10
++Author: Christopher Hoskin <mans0954 at debian.org>
++Last-Update: 16-Feb-2017
 +---
 + setup.py | 1 +
 + 1 file changed, 1 insertion(+)
 +
 +diff --git a/setup.py b/setup.py
 +index 481f16d..7a9d532 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -109,6 +109,7 @@ setuptools.setup(
 +     license='BSD',
 +     install_requires=[],
 +     tests_require=reqs('test.txt'),
 ++    test_suite = 't/unit',
 +     cmdclass={'test': pytest},
 +     zip_safe=False,
 +     include_package_data=False,

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