[Python-modules-commits] [pytest-catchlog] 02/07: record new upstream branch created by importing pytest-catchlog_1.2.1.orig.tar.xz and merge it

[daniel at danielstender.com]

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

danstender-guest pushed a commit to branch master
in repository pytest-catchlog.

commit 63226db7ed2b73d492b4e8f61037d221a293a919
Merge: 8de21ef 404dfc0
Author: Daniel Stender <debian at danielstender.com>
Date:   Wed Dec 30 19:25:18 2015 +0100

    record new upstream branch created by importing pytest-catchlog_1.2.1.orig.tar.xz and merge it

 .travis.yml             |  20 ++++
 CHANGES.rst             |  48 +++++++-
 MANIFEST.in             |   1 +
 README.rst              |  42 ++++---
 debian/.git-dpm         |  14 +--
 pytest_catchlog.py      | 287 +++++++++++++++++++++++++++++++++---------------
 setup.py                |   9 +-
 tasks.py                | 188 +++++++++++++++++++++++++++++++
 test_pytest_catchlog.py | 156 +++++++++++++++++++++-----
 tox.ini                 |   2 +-
 10 files changed, 622 insertions(+), 145 deletions(-)

diff --cc debian/.git-dpm
index 9832ed6,0000000..28b2c37
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
- 9f7b3008a9ac46b7780bbc50629e207b4ca365e9
- 9f7b3008a9ac46b7780bbc50629e207b4ca365e9
- 9f7b3008a9ac46b7780bbc50629e207b4ca365e9
- 9f7b3008a9ac46b7780bbc50629e207b4ca365e9
- pytest-catchlog_1.1.orig.tar.gz
- 85268b5141fae91f38009ac4863ef80d863d59e2
- 6540
++404dfc09250a5bb3e820347ff1ecdfb9e9f7fb85
++404dfc09250a5bb3e820347ff1ecdfb9e9f7fb85
++404dfc09250a5bb3e820347ff1ecdfb9e9f7fb85
++404dfc09250a5bb3e820347ff1ecdfb9e9f7fb85
++pytest-catchlog_1.2.1.orig.tar.xz
++bb8ad2d5d84f9559c06c88016056cdf557417c3a
++9860
 +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/pytest-catchlog.git