[Python-modules-commits] [voluptuous] 05/08: 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 b1fb42e8721a7f5e44eee4c65c38262265eeb8c1
Merge: 88ab876 e6f2094
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Tue Aug 2 14:43:55 2016 -0400

    merge patched into master

 debian/.git-dpm                                 |  4 ++--
 debian/patches/0002-Include-tests-package.patch | 22 ++++++++++++++++++++++
 debian/patches/series                           |  1 +
 setup.py                                        |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index cadd5be,0000000..0f4c484
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
- 16548658044a65ca84051912460826694f97bebe
- 16548658044a65ca84051912460826694f97bebe
++e6f20941122c3856dea65da703d0ae105ea8aa22
++e6f20941122c3856dea65da703d0ae105ea8aa22
 +96e09f6d760c570a65be150fa542abdad75f8d71
 +96e09f6d760c570a65be150fa542abdad75f8d71
 +voluptuous_0.9.2.orig.tar.gz
 +bb4924485f70be72a2c28a1a24f007108f8b8da1
 +29857
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Include-tests-package.patch
index 0000000,0000000..8be5351
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Include-tests-package.patch
@@@ -1,0 -1,0 +1,22 @@@
++From e6f20941122c3856dea65da703d0ae105ea8aa22 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at ubuntu.com>
++Date: Tue, 2 Aug 2016 14:43:42 -0400
++Subject: Include tests package.
++
++---
++ 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 9511701,0000000..62c1f41
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +restore-tests.patch
++0002-Include-tests-package.patch

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