[Python-modules-commits] [mako] 03/04: 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 b20706d76d718376d602b5cd7667de4f8fea45b2
Merge: df157e3 5d1ccaf
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Wed Dec 21 12:36:46 2016 +0100

    merge patched into master

 PKG-INFO                                           |  2 +-
 debian/.git-dpm                                    |  6 +++---
 ...r-sphinx-internal-structure-change-layout.patch | 22 ---------------------
 debian/patches/series                              |  1 -
 doc/_sources/changelog.txt                         | 23 ++++++++++++++++++++++
 doc/build/changelog.rst                            | 23 ++++++++++++++++++++++
 mako/__init__.py                                   |  2 +-
 mako/lookup.py                                     |  4 +++-
 mako/runtime.py                                    | 11 ++++++++++-
 mako/template.py                                   | 22 ++++++++++++++++++++-
 test/test_template.py                              | 15 ++++++++++++++
 11 files changed, 100 insertions(+), 31 deletions(-)

diff --cc debian/.git-dpm
index 42065b0,0000000..d02b54e
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
- fdee05b5abfc54b0c1de8326786a39d4cab58afa
- fdee05b5abfc54b0c1de8326786a39d4cab58afa
- 88956c5c9e1c96af7e6f633ebd3da7582aea387f
++5d1ccaf2c078af06033d728a7b5f7e3983a2882f
++5d1ccaf2c078af06033d728a7b5f7e3983a2882f
++5d1ccaf2c078af06033d728a7b5f7e3983a2882f
 +5d1ccaf2c078af06033d728a7b5f7e3983a2882f
 +mako_1.0.6+ds1.orig.tar.gz
 +d9e272c2925dd313d4546e2f231a738e2c2fc31a
 +272388
 +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