[Python-modules-commits] [zzzeeksphinx] 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 zzzeeksphinx.

commit 6b110de69eacefa90297a632371e5c615d0289ca
Merge: b8dbb92 0441d1e
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sun Jul 31 20:42:45 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0001-fixes-to-accommodate-sphinx-1.4.patch     | 45 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 zzzeeksphinx/mako.py                               |  2 +-
 zzzeeksphinx/themes/zzzeeksphinx/genindex.mako     |  4 +-
 5 files changed, 51 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 652b4c6,0000000..e47ad2e
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
- ca06c504ee584d64900a66fa18c3041853e9069b
- ca06c504ee584d64900a66fa18c3041853e9069b
++0441d1e3f18ea3d5cf48fb3eddc4280d716a246e
++0441d1e3f18ea3d5cf48fb3eddc4280d716a246e
 +ca06c504ee584d64900a66fa18c3041853e9069b
 +ca06c504ee584d64900a66fa18c3041853e9069b
 +zzzeeksphinx_1.0.18.orig.tar.gz
 +a991c0d72c29bb2d0eda213f3a10db59803652dd
 +22410
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-fixes-to-accommodate-sphinx-1.4.patch
index 0000000,0000000..d107f19
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-fixes-to-accommodate-sphinx-1.4.patch
@@@ -1,0 -1,0 +1,45 @@@
++From 0441d1e3f18ea3d5cf48fb3eddc4280d716a246e Mon Sep 17 00:00:00 2001
++From: Mike Bayer <mike_mp at zzzcomputing.com>
++Date: Wed, 11 May 2016 14:51:45 -0400
++Subject: - fixes to accommodate sphinx 1.4
++
++---
++ zzzeeksphinx/mako.py                           | 2 +-
++ zzzeeksphinx/themes/zzzeeksphinx/genindex.mako | 4 ++--
++ 2 files changed, 3 insertions(+), 3 deletions(-)
++
++diff --git a/zzzeeksphinx/mako.py b/zzzeeksphinx/mako.py
++index 8aac1bd..244de14 100644
++--- a/zzzeeksphinx/mako.py
+++++ b/zzzeeksphinx/mako.py
++@@ -28,7 +28,7 @@ class MakoBridge(TOCMixin, TemplateBridge):
++             directories=builder.config.templates_path + [
++                 template_path
++             ],
++-            #format_exceptions=True,
+++            # format_exceptions=True,
++             imports=[
++                 "from zzzeeksphinx import util"
++             ]
++diff --git a/zzzeeksphinx/themes/zzzeeksphinx/genindex.mako b/zzzeeksphinx/themes/zzzeeksphinx/genindex.mako
++index 9ea6795..76a3d90 100644
++--- a/zzzeeksphinx/themes/zzzeeksphinx/genindex.mako
+++++ b/zzzeeksphinx/themes/zzzeeksphinx/genindex.mako
++@@ -21,7 +21,7 @@
++         numcols = 1
++         numitems = 0
++     %>
++-% for entryname, (links, subitems) in entries:
+++% for entryname, (links, subitems) in [(a, b[0:2]) for a, b in entries]:
++ 
++ <dt>
++     % if links:
++@@ -36,7 +36,7 @@
++ 
++     % if subitems:
++     <dd><dl>
++-      % for subentryname, subentrylinks in subitems:
+++      % for subentryname, subentrylinks in subitems[0:2]:
++       <dt><a href="${subentrylinks[0][1]}">${subentryname|h}</a>
++               % for j, (unknown, link) in enumerate(subentrylinks[1:]):
++                   <a href="${link}">[${j}]</a>
diff --cc debian/patches/series
index 0000000,0000000..15e2cc9
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-fixes-to-accommodate-sphinx-1.4.patch

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