[Python-modules-commits] [pycryptodome] 03/05: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository pycryptodome.

commit 31c19e3f06a8d23cb2823f0cce659fa6368f6f94
Merge: 3ce0779 9c2281c
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Wed Jun 7 20:46:40 2017 +0100

    merge patched into master

 Doc/conf.py                                 |  2 +-
 debian/.git-dpm                             |  4 ++--
 debian/patches/0001-Fix-Documentation.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index a8eb77d,0000000..98a69be
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
- 223540de1154f40034a4be1703ef751522f99d5a
- 223540de1154f40034a4be1703ef751522f99d5a
++9c2281c6acfc21695af5def02e5133b060eb8bf8
++9c2281c6acfc21695af5def02e5133b060eb8bf8
 +223540de1154f40034a4be1703ef751522f99d5a
 +223540de1154f40034a4be1703ef751522f99d5a
 +pycryptodome_3.4.6.orig.tar.gz
 +9e6d984562df9c3781dfefe2eec46c4e36c65902
 +6494442
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-Documentation.patch
index 0000000,0000000..1001f9a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-Documentation.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 9c2281c6acfc21695af5def02e5133b060eb8bf8 Mon Sep 17 00:00:00 2001
++From: Christopher Hoskin <mans0954 at debian.org>
++Date: Wed, 7 Jun 2017 20:43:23 +0100
++Subject: Fix Documentation
++
++Author: Christopher Hoskin <mans0954 at debian.org>
++Last-Update: 2017-07-07
++---
++ Doc/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/Doc/conf.py b/Doc/conf.py
++index 7b26049..2b2be7d 100644
++--- a/Doc/conf.py
+++++ b/Doc/conf.py
++@@ -25,7 +25,7 @@ import sys, os
++ 
++ # Add any Sphinx extension module names here, as strings. They can be extensions
++ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
++-extensions = ['sphinx.ext.pngmath', 'sphinx.ext.mathjax']
+++extensions = ['sphinx.ext.mathjax']
++ 
++ # Add any paths that contain templates here, relative to this directory.
++ templates_path = ['_templates']
diff --cc debian/patches/series
index 0000000,0000000..dc61448
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-Documentation.patch

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