[Python-modules-commits] [voluptuous] 05/06: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository voluptuous.

commit 4e1fec31751f2262d7e06d9adda749978552f91f
Merge: 4d0075c 6bb916e
Author: Barry Warsaw <barry at python.org>
Date:   Wed Aug 3 10:28:22 2016 -0400

    merge patched into master

 debian/.git-dpm                           |  4 ++--
 debian/patches/add-voluptuous-tests.patch | 23 +++++++++++++++++++++++
 debian/patches/series                     |  1 +
 setup.py                                  |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 09a0dd6,0000000..a301d93
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
- e76887bc2aae782c4533fcf696cc280ba2589996
- e76887bc2aae782c4533fcf696cc280ba2589996
++6bb916e353ee49059e3d0830838d320013f7c80f
++6bb916e353ee49059e3d0830838d320013f7c80f
 +e76887bc2aae782c4533fcf696cc280ba2589996
 +e76887bc2aae782c4533fcf696cc280ba2589996
 +voluptuous_0.9.3.orig.tar.gz
 +315dd79c372380799d0d2e21ae711aa4097efb81
 +34097
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/add-voluptuous-tests.patch
index 0000000,0000000..688c53a
new file mode 100644
--- /dev/null
+++ b/debian/patches/add-voluptuous-tests.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 6bb916e353ee49059e3d0830838d320013f7c80f Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Wed, 3 Aug 2016 10:27:23 -0400
++Subject: Add tests package so nose will find them.
++
++Patch-Name: add-voluptuous-tests.patch
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 6140253..4d6275d 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -32,7 +32,7 @@ setup(
++     long_description=long_description,
++     license='BSD',
++     platforms=['any'],
++-    packages=['voluptuous'],
+++    packages=['voluptuous', 'voluptuous.tests'],
++     author='Alec Thomas',
++     author_email='alec at swapoff.org',
++     classifiers=[
diff --cc debian/patches/series
index 0000000,0000000..5fc8dda
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++add-voluptuous-tests.patch

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