[Python-modules-commits] [pycryptodome] 02/18: 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 e9c4764c44a90371ee7f7f85c4fa4fc03834173c
Merge: 7cee114 94c7a70
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Thu Jun 8 06:38:54 2017 +0100

    merge patched into master

 debian/.git-dpm                             | 4 ++--
 debian/patches/0001-Fix-Documentation.patch | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 98a69be,0000000..d5f180f
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
- 9c2281c6acfc21695af5def02e5133b060eb8bf8
- 9c2281c6acfc21695af5def02e5133b060eb8bf8
++94c7a70aa4508a343eacd9d9c29ac25bebf1e62f
++94c7a70aa4508a343eacd9d9c29ac25bebf1e62f
 +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 1001f9a,0000000..7f2f082
mode 100644,000000..100644
--- a/debian/patches/0001-Fix-Documentation.patch
+++ b/debian/patches/0001-Fix-Documentation.patch
@@@ -1,24 -1,0 +1,25 @@@
- From 9c2281c6acfc21695af5def02e5133b060eb8bf8 Mon Sep 17 00:00:00 2001
++From 94c7a70aa4508a343eacd9d9c29ac25bebf1e62f 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
++Origin: upstream, https://github.com/Legrandin/pycryptodome/commit/05eb116ee1effcc39312121386eb047772925d62
++Bug: https://github.com/Legrandin/pycryptodome/issues/73
++Last-Update: 2017-07-08
 +---
 + 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']

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