[Python-modules-commits] [pycryptodome] 10/10: 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 899000d236954176430bc7ca80bdf08607a55021
Merge: 6345072 88da766
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sat Nov 4 09:45:59 2017 +0000

    merge patched into master

 Doc/conf.py                                        |  2 +-
 debian/.git-dpm                                    |  4 ++--
 .../patches/0002-Supress-privacy-violations.patch  | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 2100589,0000000..6b09580
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
- f62d6b652cf135f635bcf2b2956e924ccba97394
- f62d6b652cf135f635bcf2b2956e924ccba97394
++88da766a52cff7965f847f51f82a25afcd283a5d
++88da766a52cff7965f847f51f82a25afcd283a5d
 +d14794536e3f86e5740f8cdb584d15d8a07ad0d7
 +d14794536e3f86e5740f8cdb584d15d8a07ad0d7
 +pycryptodome_3.4.7.orig.tar.gz
 +19e7035789179fd2574fb36baf2ea548323f5b40
 +6483140
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Supress-privacy-violations.patch
index 0000000,0000000..4b679fc
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Supress-privacy-violations.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 88da766a52cff7965f847f51f82a25afcd283a5d Mon Sep 17 00:00:00 2001
++From: Christopher Hoskin <mans0954 at debian.org>
++Date: Sat, 4 Nov 2017 09:45:16 +0000
++Subject: Supress privacy violations
++
++---
++ Doc/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/Doc/conf.py b/Doc/conf.py
++index b4b50b7..b92c844 100644
++--- a/Doc/conf.py
+++++ b/Doc/conf.py
++@@ -34,7 +34,7 @@ _raw_api.load_pycryptodome_raw_lib = lambda name, cdec: MockLib()
++ # 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.autodoc', 'sphinx.ext.napoleon',
++-        'sphinx.ext.mathjax' ]
+++        'sphinx.ext.imgmath' ]
++ 
++ # Add any paths that contain templates here, relative to this directory.
++ templates_path = ['_templates']
diff --cc debian/patches/series
index dc61448,0000000..9752f4e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Fix-Documentation.patch
++0002-Supress-privacy-violations.patch

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