[Python-modules-commits] [python-jellyfish] 02/04: merge patched into master

[Diego M. Rodriguez]

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

diegom-guest pushed a commit to branch master
in repository python-jellyfish.

commit 8541572f156e87184b5238b11a9f37471664a0b6
Merge: 767b5b8 5904ba0
Author: Diego M. Rodriguez <diego.plan9 at gmail.com>
Date:   Tue Sep 27 15:47:23 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../patches/0001-Move-man-page-to-section-3.patch  | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 587677b,0000000..55bb7a6
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,12 -1,0 +1,12 @@@
 +# see git-dpm(1) from git-dpm package
- ea4a1ce384845f8bf6cec0ad6db58ec01b975c96
- ea4a1ce384845f8bf6cec0ad6db58ec01b975c96
++5904ba0cdce6fa2ec1180af662f7aa661ca6d764
++5904ba0cdce6fa2ec1180af662f7aa661ca6d764
 +ea4a1ce384845f8bf6cec0ad6db58ec01b975c96
 +ea4a1ce384845f8bf6cec0ad6db58ec01b975c96
 +python-jellyfish_0.5.6.orig.tar.gz
 +dd3c7a69667857eca9892318a8704996a8e65642
 +132177
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
 +
diff --cc debian/patches/0001-Move-man-page-to-section-3.patch
index 0000000,0000000..07ef654
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Move-man-page-to-section-3.patch
@@@ -1,0 -1,0 +1,29 @@@
++From 5904ba0cdce6fa2ec1180af662f7aa661ca6d764 Mon Sep 17 00:00:00 2001
++From: "Diego M. Rodriguez" <diego.plan9 at gmail.com>
++Date: Tue, 27 Sep 2016 15:45:37 +0200
++Subject: Move man page to section 3
++
++Move man page from section one to section 3 (Closes: #838681). This
++patch modifies the sphinx configuration file, as it seems that currently
++it is not possible to override the man_pages setting during the command
++line invocation of sphinx-build (-D man_pages=...) due to it being a
++list of tuples.
++
++https://github.com/sphinx-doc/sphinx/issues/2977
++---
++ docs/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 800a62c..b4a7b09 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -228,7 +228,7 @@ latex_documents = [
++ # (source start file, name, description, authors, manual section).
++ man_pages = [
++     ('index', 'jellyfish', 'jellyfish Documentation',
++-     ['James Turk'], 1)
+++     ['James Turk'], 3)
++ ]
++ 
++ # If true, show URL addresses after external links.
diff --cc debian/patches/series
index 0000000,0000000..d213137
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Move-man-page-to-section-3.patch

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