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

commit 84d5324e10349a4e0d2f2f6ff87067f6d08e2ffb
Merge: 52db69d 319f978
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Thu Jul 20 20:43:37 2017 +0200

    merge patched into master

 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |   6 +-
 .../0001-fixes-to-accommodate-sphinx-1.4.patch     |  45 -------
 debian/patches/series                              |   1 -
 setup.py                                           |   4 +
 zzzeeksphinx.egg-info/PKG-INFO                     |   2 +-
 zzzeeksphinx.egg-info/entry_points.txt             |   4 +
 zzzeeksphinx/__init__.py                           |   2 +-
 zzzeeksphinx/mako.py                               |   7 +-
 zzzeeksphinx/sqlformatter.py                       |  10 +-
 zzzeeksphinx/themes/zzzeeksphinx/layout.mako       |  37 +++++-
 zzzeeksphinx/themes/zzzeeksphinx/static/docs.scss  | 141 +++++++++++++++++----
 zzzeeksphinx/themes/zzzeeksphinx/static_base.mako  |   2 +
 zzzeeksphinx/themes/zzzeeksphinx/theme.conf        |   1 +
 zzzeeksphinx/toc.py                                |  23 ++--
 15 files changed, 182 insertions(+), 105 deletions(-)

diff --cc debian/.git-dpm
index 89b15ef,0000000..c0a1c6e
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
- 0441d1e3f18ea3d5cf48fb3eddc4280d716a246e
- 0441d1e3f18ea3d5cf48fb3eddc4280d716a246e
- ca06c504ee584d64900a66fa18c3041853e9069b
++319f978af489c8c52c15e280a12f618c043d35e5
++319f978af489c8c52c15e280a12f618c043d35e5
++319f978af489c8c52c15e280a12f618c043d35e5
 +319f978af489c8c52c15e280a12f618c043d35e5
 +zzzeeksphinx_1.0.20.orig.tar.gz
 +c91cd7e57c5f9939688e76dc6f907973829026e0
 +23030
 +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/zzzeeksphinx.git