[Python-modules-commits] [mako] 03/06: merge patched into master

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository mako.

commit 4726676065ea3f180c74be7a84fd6a84c20371de
Merge: 2778b50 5dbb482
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Fri Jul 14 16:43:32 2017 +0200

    merge patched into master

 AUTHORS                                            | 13 +++++++++
 MANIFEST.in                                        |  2 +-
 PKG-INFO                                           |  2 +-
 debian/.git-dpm                                    |  6 ++---
 .../0001-update-tests-for-Pygments-2.2.patch       | 31 ----------------------
 debian/patches/series                              |  1 -
 doc/_sources/{caching.txt => caching.rst.txt}      |  0
 doc/_sources/{changelog.txt => changelog.rst.txt}  | 14 +++++++++-
 doc/_sources/{defs.txt => defs.rst.txt}            |  0
 doc/_sources/{filtering.txt => filtering.rst.txt}  |  0
 doc/_sources/{index.txt => index.rst.txt}          |  0
 .../{inheritance.txt => inheritance.rst.txt}       |  0
 .../{namespaces.txt => namespaces.rst.txt}         |  2 +-
 doc/_sources/{runtime.txt => runtime.rst.txt}      |  0
 doc/_sources/{syntax.txt => syntax.rst.txt}        |  0
 doc/_sources/{unicode.txt => unicode.rst.txt}      |  0
 doc/_sources/{usage.txt => usage.rst.txt}          |  0
 doc/build/changelog.rst                            | 14 +++++++++-
 doc/build/conf.py                                  |  4 +--
 doc/build/namespaces.rst                           |  2 +-
 doc/build/templates/genindex.mako                  |  4 +--
 mako/__init__.py                                   |  2 +-
 mako/_ast_util.py                                  |  2 +-
 mako/cache.py                                      | 14 +++++-----
 mako/cmd.py                                        |  2 +-
 mako/ext/extract.py                                |  2 +-
 mako/parsetree.py                                  |  2 +-
 mako/template.py                                   |  2 +-
 setup.cfg                                          |  1 -
 29 files changed, 63 insertions(+), 59 deletions(-)

diff --cc debian/.git-dpm
index 9d5578d,0000000..bdf2f23
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
- 2f48e82d793202903f52b65cc0e345b4efa36588
- 2f48e82d793202903f52b65cc0e345b4efa36588
- 5d1ccaf2c078af06033d728a7b5f7e3983a2882f
++5dbb4829834600621bfc7e8f9aaf89df6f967f88
++5dbb4829834600621bfc7e8f9aaf89df6f967f88
++5dbb4829834600621bfc7e8f9aaf89df6f967f88
 +5dbb4829834600621bfc7e8f9aaf89df6f967f88
 +mako_1.0.7+ds1.orig.tar.gz
 +f8ffe7c994eb28d727afbc163351157485616c5d
 +273501
 +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/mako.git