[Python-modules-commits] [voluptuous] 01/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 1b7b6e0458b413a3b3025e74afbfb17475178522
Merge: 8995cde 96e09f6
Author: Barry Warsaw <barry at python.org>
Date:   Wed Aug 3 10:23:31 2016 -0400

    merge patched into master

 debian/.git-dpm                    |   4 +-
 debian/patches/restore-tests.patch | 740 -------------------------------------
 debian/patches/series              |   1 -
 setup.py                           |   2 +-
 voluptuous/tests/__init__.py       |   1 -
 voluptuous/tests/tests.md          | 268 --------------
 voluptuous/tests/tests.py          | 421 ---------------------
 7 files changed, 3 insertions(+), 1434 deletions(-)

diff --cc debian/.git-dpm
index 3142761,0000000..8693b9f
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
- 466520f320160206832e09b2e67990e4c2a1393b
- 466520f320160206832e09b2e67990e4c2a1393b
++96e09f6d760c570a65be150fa542abdad75f8d71
++96e09f6d760c570a65be150fa542abdad75f8d71
 +96e09f6d760c570a65be150fa542abdad75f8d71
 +96e09f6d760c570a65be150fa542abdad75f8d71
 +voluptuous_0.9.2.orig.tar.gz
 +bb4924485f70be72a2c28a1a24f007108f8b8da1
 +29857
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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