[Python-modules-commits] [pycryptodome] 10/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 d500c53a52027c8720ffff8a82fc4470d07eadbc
Merge: b1c043b 1cf5e0f
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sun Jun 11 07:24:07 2017 +0100

    merge patched into master

 Doc/conf.py                                          | 2 +-
 debian/.git-dpm                                      | 4 ++--
 debian/patches/0001-Fix-Documentation.patch          | 6 +++---
 debian/patches/0002-Supress-privacy-violations.patch | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --cc debian/.git-dpm
index 4a5a0c7,0000000..dfb5cf7
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
- 470bc8569cfa78d880d8cae186b44c48ad1583d4
- 470bc8569cfa78d880d8cae186b44c48ad1583d4
++1cf5e0ff65264f3714cd34fc1a2ec14f86d59313
++1cf5e0ff65264f3714cd34fc1a2ec14f86d59313
 +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 7f2f082,0000000..cf36e57
mode 100644,000000..100644
--- a/debian/patches/0001-Fix-Documentation.patch
+++ b/debian/patches/0001-Fix-Documentation.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 94c7a70aa4508a343eacd9d9c29ac25bebf1e62f Mon Sep 17 00:00:00 2001
++From 1498662d4bc06aab30bc9845fe1cf4bc3506b17d 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
 +
 +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
++index 7b26049..f159582 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']
+++extensions = ['sphinx.ext.imgmath']
 + 
 + # Add any paths that contain templates here, relative to this directory.
 + templates_path = ['_templates']
diff --cc debian/patches/0002-Supress-privacy-violations.patch
index 3e7ae48,0000000..8ba490d
mode 100644,000000..100644
--- a/debian/patches/0002-Supress-privacy-violations.patch
+++ b/debian/patches/0002-Supress-privacy-violations.patch
@@@ -1,23 -1,0 +1,23 @@@
- From 470bc8569cfa78d880d8cae186b44c48ad1583d4 Mon Sep 17 00:00:00 2001
++From 1cf5e0ff65264f3714cd34fc1a2ec14f86d59313 Mon Sep 17 00:00:00 2001
 +From: Christopher Hoskin <mans0954 at debian.org>
 +Date: Sun, 11 Jun 2017 07:07:24 +0100
 +Subject: Supress privacy violations
 +
 +---
 + Doc/conf.py | 3 ---
 + 1 file changed, 3 deletions(-)
 +
 +diff --git a/Doc/conf.py b/Doc/conf.py
- index 2b2be7d..42f3040 100644
++index f159582..76d8744 100644
 +--- a/Doc/conf.py
 ++++ b/Doc/conf.py
 +@@ -103,9 +103,6 @@ html_theme = 'alabaster'
 + # further.  For a list of options available for each theme, see the
 + # documentation.
 + html_theme_options = {
 +-        "github_user" : "Legrandin",
 +-        "github_repo" : "pycryptodome",
 +-        "github_banner" : "true",
 + }
 + 
 + # Add any paths that contain custom themes here, relative to this directory.

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