[Python-modules-commits] [paste] 04/04: merge patched into master

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository paste.

commit 03a9e6d8c0a2f5e28575b947f2660e6fd8c0a615
Merge: 387c3bb 1c821a6
Author: Ondřej Nový <novy at ondrej.org>
Date:   Thu Mar 10 19:10:58 2016 +0100

    merge patched into master

 PKG-INFO                             |    2 +-
 Paste.egg-info/PKG-INFO              |    2 +-
 Paste.egg-info/SOURCES.txt           |    2 +
 Paste.egg-info/requires.txt          |    2 +-
 debian/.git-dpm                      |    6 +-
 debian/patches/0001-Py3k-fixes.patch |  311 --------
 debian/patches/series                |    1 -
 docs/news.txt                        |   28 +
 paste/httpserver.py.orig             | 1431 ++++++++++++++++++++++++++++++++++
 paste/wsgilib.py                     |    6 +-
 setup.py                             |    4 +-
 tests/test_template.txt              |    4 +-
 tests/test_wsgilib.py                |   52 ++
 tox.ini                              |   10 +-
 14 files changed, 1533 insertions(+), 328 deletions(-)

diff --cc debian/.git-dpm
index e03f0db,0000000..921abb3
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
- e7efa9cfa29c8b4abf8dde5a47bcb28a5945b9b1
- e7efa9cfa29c8b4abf8dde5a47bcb28a5945b9b1
- ee1bf51e47766c6d99c9bdda5e1f07e39a2fb49b
++1c821a6f4b8f2e176228a8c4b055f98d94a56e70
++1c821a6f4b8f2e176228a8c4b055f98d94a56e70
++1c821a6f4b8f2e176228a8c4b055f98d94a56e70
 +1c821a6f4b8f2e176228a8c4b055f98d94a56e70
 +paste_2.0.3+dfsg.orig.tar.gz
 +63c4d0e4cd1b780da53a6a234d2df608fc6c6279
 +594469
 +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/paste.git