[Python-modules-commits] [mako] 02/03: 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 d933362b213ce27e92259d0f1c94ed95e90c1057
Merge: 343bee6 fdee05b
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Wed Nov 2 23:34:02 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...r-sphinx-internal-structure-change-layout.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 doc/build/templates/genindex.mako                  |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index f663a8f,0000000..cd63748
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
- 88956c5c9e1c96af7e6f633ebd3da7582aea387f
- 88956c5c9e1c96af7e6f633ebd3da7582aea387f
++fdee05b5abfc54b0c1de8326786a39d4cab58afa
++fdee05b5abfc54b0c1de8326786a39d4cab58afa
 +88956c5c9e1c96af7e6f633ebd3da7582aea387f
 +88956c5c9e1c96af7e6f633ebd3da7582aea387f
 +mako_1.0.4+ds1.orig.tar.gz
 +659d200a9723555f97a10163dfe69bf294727f8b
 +271924
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Update-for-sphinx-internal-structure-change-layout.patch
index 0000000,0000000..be530d6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Update-for-sphinx-internal-structure-change-layout.patch
@@@ -1,0 -1,0 +1,22 @@@
++From fdee05b5abfc54b0c1de8326786a39d4cab58afa Mon Sep 17 00:00:00 2001
++From: Nishanth Aravamudan <nish.aravamudan at canonical.com>
++Date: Wed, 2 Nov 2016 23:33:37 +0100
++Subject: Update for sphinx internal structure change layout
++
++---
++ doc/build/templates/genindex.mako | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/doc/build/templates/genindex.mako b/doc/build/templates/genindex.mako
++index 0a25b67..2f45f79 100644
++--- a/doc/build/templates/genindex.mako
+++++ b/doc/build/templates/genindex.mako
++@@ -21,7 +21,7 @@
++         numcols = 1
++         numitems = 0
++     %>
++-% for entryname, (links, subitems) in entries:
+++% for entryname, (links, subitems, dummy) in entries:
++ 
++ <dt>
++     % if links:
diff --cc debian/patches/series
index 0000000,0000000..fdb1e43
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Update-for-sphinx-internal-structure-change-layout.patch

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